Project

General

Profile

Revision 2400a412

ID2400a412b4cab44c7b729473826374181423498c
Parent e1dd683a
Child 7c29c9d5

Added by Katja Luther over 2 years ago

adapt editor to changes in biocase query

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java
53 53
        String herbarium = specimenSearchController.getHerbarium();
54 54
        String locality = specimenSearchController.getLocality();
55 55
        String taxonName = specimenSearchController.getTaxonName();
56
        return new OccurenceQuery(taxonName, collector, collectorsNumber, accessionNumber, herbarium, country, locality, dateFrom, dateTo);
56
        return new OccurenceQuery(taxonName, collector, collectorsNumber, accessionNumber, herbarium, country, locality, dateFrom, dateTo, false);
57 57
    }
58 58

  
59 59
    /**
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java
10 10

  
11 11
import java.io.IOException;
12 12
import java.io.InputStream;
13
import java.net.URI;
14 13

  
15 14
import javax.inject.Inject;
16 15

  
......
25 24
import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
26 25
import org.eclipse.jface.wizard.Wizard;
27 26
import org.eclipse.swt.widgets.Display;
28
import org.w3c.dom.NodeList;
29 27

  
30 28
import eu.etaxonomy.cdm.database.DbSchemaValidation;
31 29
import eu.etaxonomy.cdm.ext.common.ServiceWrapperBase;
......
93 91
                stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri());
94 92
                SpecimenImportReport report = new SpecimenImportReport();
95 93
                UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report);
96
                NodeList nodeList = unitNodesList.getAssociatedUnits();
97
                String prefix = unitNodesList.getPrefix();
98
                String associationType = unitNodesList.getAssociationType();
99
                if (nodeList != null){
100
                    URI uri =AbcdParseUtility.parseFirstUri(nodeList, report);
101
                    String content = AbcdParseUtility.parseFirstTextContent(nodeList);
102
                }
103 94

  
104 95
                MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_VIEW_DATAIMPORT_E4_SPECIMENIMPORTVIEWE4);
105 96
                part = partService.showPart(part, PartState.ACTIVATE);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardPageE4.java
56 56
        String herbarium = specimenSearchController.getHerbarium();
57 57
        String locality = specimenSearchController.getLocality();
58 58
        String taxonName = specimenSearchController.getTaxonName();
59
        return new OccurenceQuery(taxonName, collector, collectorsNumber, accessionNumber, herbarium, country, locality, dateFrom, dateTo);
59
        return new OccurenceQuery(taxonName, collector, collectorsNumber, accessionNumber, herbarium, country, locality, dateFrom, dateTo, false);
60 60
    }
61 61

  
62 62
    /**
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java
92 92
    }
93 93

  
94 94
    public void saveLastSate() {
95
        lastQuery = new OccurenceQuery(getTaxonName(), getCollector(), getCollectorNumber(), getAccessionNumber(), getHerbarium(), getCountry(false), getLocality(), getDateFrom(), getDateTo());
95
        lastQuery = new OccurenceQuery(getTaxonName(), getCollector(), getCollectorNumber(), getAccessionNumber(), getHerbarium(), getCountry(false), getLocality(), getDateFrom(), getDateTo(), false);
96 96
    }
97 97

  
98 98
    /**

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)