Changeset 5661

Timestamp:

Jun 17, 2011, 9:19:46 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Merged patch release 2.17.2 to the trunk.

Location:

trunk/src

Files:

• core/net/sf/basedb/util/importer/spotdata/BaseFileImporter.java (modified) (1 diff)
• install/net/sf/basedb/install/Webclient.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/importer/spotdata/BaseFileImporter.java

@@ -301 +301 @@
       if (chainedProgress != null) chainedProgress.setRange(30, 40);
       createChildPositionReporterMapping(child, info, chainedProgress);
-      if (!info.getChildHasDifferentReporterPositionMapping())
+      if (!info.getChildHasDifferentReporterPositionMapping() && child.getRawDataType().isStoredInDb())
       {
         // If the child and parent has identical position/reporter mapping

trunk/src/install/net/sf/basedb/install/Webclient.java

@@ -129 +129 @@
       createSetting(client, "server.transferRate", Integer.toString(100 * 1024 * 1024)); // 100MB/s
       createSetting(client, "server.links.reportbug", "http://base.thep.lu.se/#Feedback");
-      createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/doc/html/index.html");
+      createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/latest/html/index.html");
       createSetting(client, "server.links.faq", "");
       

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

@@ -581 +581 @@
     Set<Include> includes = EnumSet.noneOf(Include.class);
     if (Boolean.TRUE.equals((Boolean)job.getValue("includeMine"))) includes.add(Include.MINE);
-    if (!Boolean.FALSE.equals((Boolean)job.getValue("includeSharedTo"))) includes.add(Include.MINE);
-    if (!Boolean.FALSE.equals((Boolean)job.getValue("includeInProject"))) includes.add(Include.IN_PROJECT);
+    if (Boolean.TRUE.equals((Boolean)job.getValue("includeSharedTo"))) includes.add(Include.SHARED);
+    if (Boolean.TRUE.equals((Boolean)job.getValue("includeInProject"))) includes.add(Include.IN_PROJECT);
     if (Boolean.TRUE.equals((Boolean)job.getValue("includeOthers"))) includes.add(Include.OTHERS);
     itemQuery = idMethod.prepareQuery(dc, createItemQuery());
-    itemQuery.include(includes);
+    itemQuery.setIncludes(includes);
     
     List<ItemSubtype> subtypes = (List<ItemSubtype>)job.getValues("itemSubtypes");