Changeset 3725

Timestamp:

Sep 13, 2007, 12:59:38 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Merged patch release 2.4.1 to the trunk. Delta 2.4.1 - 2.4.

Location:

trunk

Files:

• config/dist/mysql-migration-queries.sql (modified) (1 diff)
• doc/src/docbook/admindoc/installation_upgrade.xml (modified) (4 diffs)
• src/clients/migrate/net/sf/basedb/clients/migrate/CommonItemTransfer.java (modified) (1 diff)
• src/clients/migrate/net/sf/basedb/clients/migrate/GroupTransfer.java (modified) (1 diff)
• src/clients/migrate/net/sf/basedb/clients/migrate/Migrater.java (modified) (11 diffs)
• src/clients/migrate/net/sf/basedb/clients/migrate/QuotaTransfer.java (modified) (1 diff)
• src/clients/migrate/net/sf/basedb/clients/migrate/RawBioAssayDataTransfer.java (modified) (5 diffs)
• src/clients/migrate/net/sf/basedb/clients/migrate/RawBioAssayTransfer.java (modified) (1 diff)
• src/clients/migrate/net/sf/basedb/clients/migrate/ReporterTransfer.java (modified) (4 diffs)
• src/clients/migrate/net/sf/basedb/clients/migrate/SharedItemTransfer.java (modified) (1 diff)
• src/clients/migrate/net/sf/basedb/clients/migrate/Transfer.java (modified) (2 diffs)
• src/clients/migrate/net/sf/basedb/clients/migrate/UserTransfer.java (modified) (3 diffs)
• src/clients/web/net/sf/basedb/clients/web/util/NameablePluginAdaptor.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Type.java (modified) (1 diff)
• src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (2 diffs)
• src/test/set_classpath.bat (modified) (1 diff)
• src/test/set_classpath.sh (modified) (1 diff)
• www/common/anytoany/edit_anytoany.jsp (modified) (6 diffs)
• www/common/anytoany/list_anytoany.jsp (modified) (4 diffs)
• www/exception/exception.jsp (modified) (1 diff)
• www/filemanager/upload/show_exception.jsp (modified) (1 diff)

trunk/config/dist/mysql-migration-queries.sql

@@ -1126 +1126 @@
 
 /* selectMinimumReporters */
-SELECT `id`, `reporterId` 
+SELECT `id`, `reporterId`, `geneName`, `geneSymbol`
 FROM `Reporter` 
 ORDER BY `id` 

trunk/doc/src/docbook/admindoc/installation_upgrade.xml

@@ -48 +48 @@
   <para>
     The first time installation is only to be performed once,
-    optionally followed by a migration. The migration can only be
-    done to a pristine (empty) BASE 2 server, and migration from
-    several BASE 1 installations to one BASE 2 server is not
-    supported.
+    optionally followed by a migration. The migration can only be done
+    to a pristine (empty) BASE 2 server with one exception; The
+    migration can be restarted if it fails during the RawBioAssaysData
+    transfer, for all other failure points the migration has to be
+    restarted with an empty database. Migration from several BASE 1
+    installations to one BASE 2 server is not supported.
   </para>
 
@@ -1008 +1010 @@
             <xref linkend="user_administration"/>.
           </para>
+          <para>
+            If you are planning to perform a migration of data from
+            BASE 1.2.x please perform the steps in
+            <xref linkend="installation_upgrade.migration"/> before
+            doing anything else with your new BASE installation.
+          </para>
         </listitem>
       </varlistentry>
@@ -1059 +1067 @@
 
     <para>
-      There is currently no way to restart a migration. The behaviour
-      of migration is controlled
-      through <filename>migration.properties</filename> file (see <xref linkend="appendix.migrate.properties"/>), but you
-      should know what you do when you change parameters in this file.
+      The behaviour of migration is controlled
+      through <filename>migration.properties</filename> file (see
+      <xref linkend="appendix.migrate.properties"/>), but you should
+      know what you do when you change parameters in this file.
+    </para>
+
+    <para>
+      Migration can be restarted in one specific case only; If the
+      migration fails during the RawBioAssaysData transfer simply
+      restart the migration and the script will ask you to verify that
+      a restart should be attempted. For all other failure points the
+      migration has to be restarted with an empty database.
     </para>
 
@@ -1138 +1154 @@
 ./migrate_from_1.2.sh</programlisting>
           </para>
+          <para>
+            If the migration fails during the RawBioAssaysData
+            transfer you can restart the migration at the point of
+            failure. Simply restart the migration and the script will
+            ask you to verify that a restart should be attempted. For
+            all other failure points the migration has to be restarted
+            with an empty database.
+          </para>
         </listitem>
 

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/CommonItemTransfer.java

@@ -62 +62 @@
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("net.sf.basedb.clients.migrate.CommonItemTransfer");
   
+  CommonItemTransfer()
+  {}
   
   CommonItemTransfer(UserTransfer userT, GroupTransfer groupT)

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/GroupTransfer.java

@@ -68 +68 @@
   private QuotaTransfer quotaT = null;
 
+  GroupTransfer()
+  {}
+  
   /**
   @param userT Depends on a finnished UserTransfer.

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/Migrater.java

@@ -31 +31 @@
 import net.sf.basedb.core.SessionControl;
 import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -99 +103 @@
     try
     {
-      ReporterTransfer reporterT = new ReporterTransfer();
+      ReporterTransfer reporterT = new ReporterTransfer(false);
       startTransfer(reporterT, "Reporter");
       RoleTransfer roleT = new RoleTransfer();
@@ -108 +112 @@
       startTransfer(userT, "User");
       GroupTransfer groupT = new GroupTransfer(userT, quotaT);
-      startTransfer(groupT, "Group");
+      startTransfer(groupT, "Group");   
       PluginTransfer pluginT = new PluginTransfer(userT, groupT);
       startTransfer(pluginT, "Plugins");
@@ -189 +193 @@
           groupT, scanT, arrayTypeT, uploadFT, softwareT, sampleT);
       startTransfer(rawBioAssayT, "RawBioAssay");
+      createResumePoint(userT, groupT, rawBioAssayT);
       RawBioAssayDataTransfer rawBioAssayDataT = new RawBioAssayDataTransfer(
-          userT, groupT, rawBioAssayT, arrayTypeT, reporterT);
+          rawBioAssayT, reporterT);
       startTransfer(rawBioAssayDataT, "RawBioAssayData");
+      removeResumePoint();
       ExperimentTransfer experimentT = new ExperimentTransfer(userT,
           groupT, rawBioAssayT);
@@ -203 +209 @@
       System.exit(1);
     }
-    catch (Exception e)
+    catch (Throwable e)
     {
       log.error("The migration FAILED", e);
@@ -210 +216 @@
   }
 
+  public void resume()
+  {
+    try
+    {
+      // Reporters must be mapped using external ID from BASE 1 and BASE 2
+      ReporterTransfer reporterT = new ReporterTransfer(true);
+      startTransfer(reporterT, "Reporter");
+      
+      // Pre-existing quota is loaded from BASE 2
+      QuotaTransfer quotaT = new QuotaTransfer();
+      startTransfer(quotaT, "Quota");
+
+      ObjectInputStream ois = new ObjectInputStream(new FileInputStream("migration.tmp"));
+      // Map of user ID:s are read from file
+      UserTransfer userT = new UserTransfer(quotaT);
+      userT.setup(FROM, TO, sessionControl, BASE2, migrateProperties);
+      log.info("Loading users from 'migration.tmp' file...");
+      userT.readRestorePointData(ois);
+      log.info("Found " + userT.getIdMap().size() + " users");
+      if (log.isDebugEnabled()) log.debug("User ID Map (Base 1 --> Base2): " + userT.getIdMap());
+
+      // Map of group ID:s are read from file
+      GroupTransfer groupT = new GroupTransfer();
+      log.info("Loading groups from 'migration.tmp' file...");
+      groupT.readRestorePointData(ois);
+      log.info("Found " + groupT.getIdMap().size() + " groups");
+      if (log.isDebugEnabled()) log.debug("Group ID Map (Base 1 --> Base2): " + groupT.getIdMap());
+      
+      // Map of raw bioassay ID:s are read from file
+      RawBioAssayTransfer rawBioAssayT = new RawBioAssayTransfer();
+      log.info("Loading raw bioassays from 'migration.tmp' file...");
+      rawBioAssayT.readRestorePointData(ois);
+      log.info("Found " + rawBioAssayT.getIdMap().size() + " raw bioassays");
+      if (log.isDebugEnabled()) log.debug("Raw bioassay ID Map (Base 1 --> Base2): " + rawBioAssayT.getIdMap());
+      ois.close();
+      
+      // RawBioassayTransfer runs normally, but checks if a raw bioassay already has raw data
+      RawBioAssayDataTransfer rawBioAssayDataT = new RawBioAssayDataTransfer(rawBioAssayT, 
+          reporterT);
+      startTransfer(rawBioAssayDataT, "RawBioAssayData");
+      removeResumePoint();
+      
+      // Experiment transfter runs normally
+      ExperimentTransfer experimentT = new ExperimentTransfer(userT,
+          groupT, rawBioAssayT);
+      startTransfer(experimentT, "Experiment");
+      
+      // Runs normally
+      userT.finalizeQuota();
+
+      print("END MIGRATION");
+      log.info("Migration ended");
+      Application.stop();
+      System.exit(1);
+      
+    }
+    catch (Throwable e)
+    {
+      log.error("The migration FAILED", e);
+      stop();
+    }
+  }
+  
+  private void createResumePoint(Transfer...transfers)
+    throws IOException
+  {
+    log.info("Creating resume point");
+    ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("migration.tmp"));
+    for (Transfer t: transfers)
+    {
+      log.info("Store to resume point: " + t);
+      t.writeRestorePointData(oos);
+    }
+    oos.close();
+  }
+  
+  private void removeResumePoint()
+  {
+    log.info("Removing resume point");
+    java.io.File resumePoint = new java.io.File("migration.tmp");
+    resumePoint.delete();
+  }
+  
   private void startTransfer(Transfer transfer, String property)
   {
@@ -474 +563 @@
     System.err.println("-----------------------------------------------------------------------");
 
+    java.io.File restorePoint = new java.io.File("migration.tmp");
+    boolean resumeMigration = false;
+
     if (args == null || args.length == 0 || !"disclaimer_understood".equals(args[0]))
     {
@@ -479 +571 @@
       System.exit(0);
     }
+    else if (restorePoint.exists())
+    {
+      System.err.println("FOUND DATA FROM A PREVIOUSLY INTERRUPTED MIGRATION.");
+      System.err.println("\n   Press ENTER to resume the migration\nor\n   Ctrl-C to abort\n");
+      System.err.println("To start a new migration delete the './migration.tmp' file");
+      System.err.println("before starting the migration program.");
+      waitForEnter();
+      resumeMigration = true;
+    }
     else
     {
@@ -485 +586 @@
     }
     
-    System.err.println("Starting migration...");
+    System.err.println(resumeMigration ? "Resuming migration" : "Starting migration...");
     Application.start(false);
     Migrater migrater = new Migrater();
@@ -493 +594 @@
     migrater.prepareStatementsFromFile();
     log.info("Migration initialisation DONE");
-    migrater.run();
+    if (resumeMigration)
+    {
+      migrater.resume();
+    }
+    else
+    {
+      migrater.run();
+    }
   }
   
@@ -506 +614 @@
     {}
   }
-  
-  
+    
 }

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/QuotaTransfer.java

@@ -95 +95 @@
       quota.setName(formatBytes(totalQuota));
       dc.saveItem(quota);
+      quotas.put(totalQuota, quota);
     }
     else

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/RawBioAssayDataTransfer.java

@@ -47 +47 @@
 
 public class RawBioAssayDataTransfer 
-  extends CommonItemTransfer
+  extends Transfer
 {
   /**
@@ -77 +77 @@
   @param groupT A finished {@link GroupTransfer}
    */
-  RawBioAssayDataTransfer(UserTransfer userT, GroupTransfer groupT,
-      RawBioAssayTransfer rbaT, ArrayTypeTransfer arrayTypeT,
-      ReporterTransfer reporterT)
-  {
-    super(userT, groupT);
+  RawBioAssayDataTransfer(RawBioAssayTransfer rbaT, ReporterTransfer reporterT)
+  {
+    super();
     log.debug("Checking that necessary transfers have been done before proceeding with RawBioAssayData");
-    if (rbaT != null && rbaT.isDone() && arrayTypeT != null
-        && arrayTypeT.isDone() && reporterT != null
-        && reporterT.isDone())
+    if (rbaT != null && rbaT.isDone() && 
+      reporterT != null && reporterT.isDone())
     {
       this.rbaT = rbaT;
@@ -93 +90 @@
     {
       if (!rbaT.isDone()) log.debug("Dependency: RawBioAssays haven't been transfered");
-      if (!arrayTypeT.isDone()) log.debug("Dependency: ArrayTypes haven't been transfered");
       if (!reporterT.isDone()) log.debug("Dependency: Reporters haven't been transfered");
       dependencyFailure();
@@ -133 +129 @@
         log.debug("RawBioAssay '" + rawBioAssayId + "' " + (hasArrayDesign ? "has " : "no ") + "Array Design");
       }
-      transferRawBioAssayData(rawBioAssay, rawBioAssayId, hasArrayDesign);
+      if (!rawBioAssay.hasData())
+      {
+        transferRawBioAssayData(rawBioAssay, rawBioAssayId, hasArrayDesign);
+      }
+      else
+      {
+        log.info("Skipping since it already has data");
+        progress.increase(rawBioAssay.getSpots());
+      }
       progress.decrease(); // We do not want to count the RawBioAssays
       if (log.isDebugEnabled())
@@ -263 +267 @@
       if (log.isInfoEnabled())
       {
-        log.info("Transfered " + rowCount + " rows of RawData for raw bioassay" + rawBioAssay.getName());
+        log.info("Transfered " + rowCount + " rows of RawData for raw bioassay: " + rawBioAssay.getName());
       }
     }

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/RawBioAssayTransfer.java

@@ -63 +63 @@
   private SampleTransfer sampleT = null;
 
+  RawBioAssayTransfer()
+  {}
+  
   /**
   Constructs a new RawBioAssayTransfer.

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/ReporterTransfer.java

@@ -90 +90 @@
   
   /**
+    Flag that indicates if we should run in RESUME mode 
+    (ie. NOT create new reporter items, only map ID:s)
+  */
+  private boolean RESUME = false;
+  
+  /**
   Set string and text properties, order must match the select statement
   except for the id and reporterId in the beginning Extended properties are
@@ -102 +108 @@
   Reporters are independant from other transfers.
    */
-  ReporterTransfer()
-  {}
+  ReporterTransfer(boolean resume)
+  {
+    RESUME = resume;
+  }
 
   public void start()
   {
-    if (!QUICK_TRANSFER) log.info("Transferring reporters...");
-    else log.info("Transferring reporters with minimum properties...");
+    if (RESUME) QUICK_TRANSFER = true;
+    if (RESUME)
+    {
+      log.info("Loading reporters...");
+    }
+    else if (!QUICK_TRANSFER)
+    {
+      log.info("Transferring reporters...");
+    }
+    else 
+    {
+      log.info("Transferring reporters with minimum properties...");
+    }
     
     int count = getInt("countReporters");
@@ -199 +218 @@
         rowCount++;
         ReporterData item = createDataItem(rs);
-        if (item != null) batcher.insert(item);
+        if (item != null && !RESUME) batcher.insert(item);
         progress.increase();
       }
@@ -319 +338 @@
       }
       rd = Reporter.getNew(externalId);
+      String name = rs.getString(3);
+      if (name == null || "".equals(name)) name = externalId;
+      rd.setName(name);
+      rd.setSymbol(rs.getString(4));
       if (!QUICK_TRANSFER)
       {
-        String name = rs.getString(3);
-        if (name == null || "".equals(name)) name = externalId;
-        rd.setName(name);
-        rd.setSymbol(rs.getString(4));
         int columnIndex = 5;
         for (String property : stringProperties)

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/SharedItemTransfer.java

@@ -83 +83 @@
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("net.sf.basedb.clients.migrate.SharedItemTransfer");
 
+  SharedItemTransfer()
+  {}
+  
   SharedItemTransfer(UserTransfer userT, GroupTransfer groupT)
   {

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/Transfer.java

@@ -32 +32 @@
 import net.sf.basedb.core.ItemAlreadyExistsException;
 import net.sf.basedb.core.SessionControl;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -613 +617 @@
     return Integer.parseInt(value);
   }
+  
+  /**
+    Store ID map and some boolean flags
+  */
+  protected void writeRestorePointData(ObjectOutputStream out)
+    throws IOException
+  {
+    out.writeBoolean(dependencyFailed);
+    out.writeBoolean(done);
+    out.writeBoolean(idMap != null);
+    if (idMap != null) out.writeObject(idMap);
+  }
+  
+  /**
+    Store ID map and some boolean flags
+  */
+  @SuppressWarnings("unchecked")
+  protected void readRestorePointData(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    dependencyFailed = in.readBoolean();
+    done = in.readBoolean();
+    if (in.readBoolean())
+    {
+      idMap = (Map<Integer, Integer>)in.readObject();
+    }
+  }
+
 }

trunk/src/clients/migrate/net/sf/basedb/clients/migrate/UserTransfer.java

@@ -36 +36 @@
 import net.sf.basedb.core.SystemItems;
 import net.sf.basedb.core.User;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -90 +94 @@
    */
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("net.sf.basedb.clients.migrate.UserTransfer");
+  
+  UserTransfer(QuotaTransfer quotaT)
+  {
+    this.quotaT = quotaT;
+  }
   
   /**
@@ -323 +332 @@
   }
   
+  /**
+    Store quota map
+  */
+  protected void writeRestorePointData(ObjectOutputStream out)
+    throws IOException
+  {
+    super.writeRestorePointData(out);
+    out.writeObject(base1FileQuota);
+  }
+  
+  /**
+    Store ID map and some boolean flags
+  */
+  @SuppressWarnings("unchecked")
+  protected void readRestorePointData(ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    super.readRestorePointData(in);
+    base1FileQuota = (Map<Integer, Long>)in.readObject();
+  }
+  
   public User getUserById(DbControl dc, int base1Id)
   {

trunk/src/clients/web/net/sf/basedb/clients/web/util/NameablePluginAdaptor.java

@@ -27 +27 @@
 
 import net.sf.basedb.core.InvalidDataException;
+import net.sf.basedb.core.InvalidUseOfNullException;
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.Nameable;
@@ -51 +52 @@
   public NameablePluginAdaptor(PluginDefinition plugin)
   {
+    if (plugin == null) throw new InvalidUseOfNullException("PluginDefinition cannot be null");
     this.plugin = plugin;
   }

trunk/src/core/net/sf/basedb/core/Type.java

@@ -467 +467 @@
         if (value.indexOf('e') >= 0)
         {
-          // Convert 'e' to 'E' (in scientific notation only 'E' is allowed) and try again
-          return parseString(value.replace('e', 'E'), numberFormat, nullIfException);
+          //Convert 'e' to 'E' (in scientific notation only 'E' is allowed) and try again         
+          return parseString(value.replace('e', 'E').replace("E+", "E"), numberFormat, nullIfException);
         }
         else

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -290 +290 @@
         BioAssaySet bas = getCurrentBioAssaySet(dc);
         int channels = bas.getRawDataType().getChannels();
-        Integer maxChannels = (Integer) configuration.getValue(maxChannelsParameter.getName());
-        Integer minChannels = (Integer) configuration.getValue(minChannelsParameter.getName());;
+        int maxChannels = Values.getInt(String.valueOf(configuration.getValue(maxChannelsParameter.getName())), 0);
+        int minChannels = Values.getInt(String.valueOf(configuration.getValue(minChannelsParameter.getName())), 0);
         if (channels < minChannels || ( maxChannels != 0 && channels > maxChannels))
         {
-          message = configuration.getPluginConfiguration().getName() + " can't work on " + channels + "-channel data; min=" + minChannels + "; max=" + maxChannels;
-          return message;
+          return configuration.getPluginConfiguration().getName() + " can't work on " + channels + "-channel data; min=" + minChannels + "; max=" + maxChannels;
         }
         List<String> extraValues = new ArrayList<String>();
@@ -302 +301 @@
           extraValues.add(ev.getExtraValueType().getExternalId());
         }
-        Pattern p = Pattern.compile("_xc_(.+)\\t?");
-        Matcher m = p.matcher((CharSequence) configuration.getValue(usedFieldsParameter.getName()));
-        while (message == null && m.find())
-        {
-          if (!extraValues.contains(m.group(1)))
-          {
-            throw new InvalidDataException("Requires extra value '"+ m.group(1) +"' attached to BioAssaySet");
-          }
-        }
+        String[] usedFields = String.valueOf(configuration.getValue(usedFieldsParameter.getName())).split("\\\\t");
+        for (String field : usedFields)
+        {
+          if (field.startsWith("_xc_") && !extraValues.contains(field.substring(4)))
+          {
+            return "Requires extra value '"+ field.substring(4) +"' attached to BioAssaySet";
+          }
+        }
+      }
+      catch (Exception e)
+      {
+        message = ""+e.getMessage();
+        e.printStackTrace();
       }
       finally

trunk/src/test/set_classpath.bat

@@ -31 +31 @@
 REM Testdata
 SET CP=%CP%;data
+SET CP=%CP%;../../data
 SET CP=%CP%;../../testdata
 

trunk/src/test/set_classpath.sh

@@ -31 +31 @@
 # Testdata
 CP=$CP:data
+CP=$CP:../../data
 CP=$CP:../../testdata
 

trunk/www/common/anytoany/edit_anytoany.jsp

@@ -37 +37 @@
   import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.ItemNotFoundException"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
@@ -44 +45 @@
 <%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
 <%!
-private String getName(BasicItem item, boolean readItem)
+private String getName(BasicItem item, boolean readItem, boolean missingItem, Item itemType, int id)
 {
   String name = "";
@@ -60 +61 @@
   {
     name = "<i>- denied -</i>";
+  }
+  else if (missingItem)
+  {
+    name = "<i>- missing -</i> (" + itemType.toString() + "; id=" + id + ")";
   }
   else if (item == null)
@@ -105 +110 @@
     BasicItem to = null;
     boolean readTo = true;
+    boolean missingTo = false;
     
     BasicItem from = null;
     boolean readFrom = true;
+    boolean missingFrom = false;
     
     try
@@ -117 +124 @@
       readTo = false;
     }
+    catch (ItemNotFoundException ex)
+    {
+      missingTo = true;
+    }
     
     try
@@ -126 +137 @@
       readFrom = false;
     }
-    
-    toName = getName(to, readTo);
-    fromName = getName(from, readFrom);
+    catch (ItemNotFoundException ex)
+    {
+      missingFrom = true;
+    }
+  
+    toName = getName(to, readTo, missingTo, anyToAny.getToType(), anyToAny.getToId());
+    fromName = getName(from, readFrom, missingFrom, anyToAny.getFromType(), anyToAny.getFromId());
   }
   if (anyToAny != null) anyToAny.checkPermission(Permission.WRITE);

trunk/www/common/anytoany/list_anytoany.jsp

@@ -37 +37 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.ItemNotFoundException"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
@@ -105 +106 @@
             BasicItem to = null;
             boolean readTo = true;
+            boolean missingTo = false;
             try
             {
@@ -112 +114 @@
             {
               readTo = false;
+            }
+            catch (ItemNotFoundException ex)
+            {
+              missingTo = true;
             }
             
@@ -128 +134 @@
             {
               toLink = "<i>- denied -</i>";
+            }
+            else if (missingTo)
+            {
+              toLink = "<i>- missing -</i> (" + ata.getToType().toString() + "; id=" + ata.getToId() + ")";
             }
             else if (to == null)

trunk/www/exception/exception.jsp

@@ -121 +121 @@
       Main.hide('goback');
     }
-    if (window.opener != null)
+    if (window.top != null && window.top.opener != null)
     {
       // popup window --> Hide menubar

trunk/www/filemanager/upload/show_exception.jsp

@@ -51 +51 @@
 sc.setSessionSetting("FileUploadProgress", null);
 sc.setSessionSetting("UnpackProgress", null);
-throw progress.getException();
+if (progress.getException() != null) throw progress.getException();
 %>