Changeset 5661


Ignore:
Timestamp:
Jun 17, 2011, 9:19:46 AM (10 years ago)
Author:
Nicklas Nordborg
Message:

Merged patch release 2.17.2 to the trunk.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core/net/sf/basedb/util/importer/spotdata/BaseFileImporter.java

    r5590 r5661  
    301301      if (chainedProgress != null) chainedProgress.setRange(30, 40);
    302302      createChildPositionReporterMapping(child, info, chainedProgress);
    303       if (!info.getChildHasDifferentReporterPositionMapping())
     303      if (!info.getChildHasDifferentReporterPositionMapping() && child.getRawDataType().isStoredInDb())
    304304      {
    305305        // If the child and parent has identical position/reporter mapping
  • trunk/src/install/net/sf/basedb/install/Webclient.java

    r5617 r5661  
    129129      createSetting(client, "server.transferRate", Integer.toString(100 * 1024 * 1024)); // 100MB/s
    130130      createSetting(client, "server.links.reportbug", "http://base.thep.lu.se/#Feedback");
    131       createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/doc/html/index.html");
     131      createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/latest/html/index.html");
    132132      createSetting(client, "server.links.faq", "");
    133133     
  • trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

    r5652 r5661  
    581581    Set<Include> includes = EnumSet.noneOf(Include.class);
    582582    if (Boolean.TRUE.equals((Boolean)job.getValue("includeMine"))) includes.add(Include.MINE);
    583     if (!Boolean.FALSE.equals((Boolean)job.getValue("includeSharedTo"))) includes.add(Include.MINE);
    584     if (!Boolean.FALSE.equals((Boolean)job.getValue("includeInProject"))) includes.add(Include.IN_PROJECT);
     583    if (Boolean.TRUE.equals((Boolean)job.getValue("includeSharedTo"))) includes.add(Include.SHARED);
     584    if (Boolean.TRUE.equals((Boolean)job.getValue("includeInProject"))) includes.add(Include.IN_PROJECT);
    585585    if (Boolean.TRUE.equals((Boolean)job.getValue("includeOthers"))) includes.add(Include.OTHERS);
    586586    itemQuery = idMethod.prepareQuery(dc, createItemQuery());
    587     itemQuery.include(includes);
     587    itemQuery.setIncludes(includes);
    588588   
    589589    List<ItemSubtype> subtypes = (List<ItemSubtype>)job.getValues("itemSubtypes");
Note: See TracChangeset for help on using the changeset viewer.