Project

General

Profile

« Previous | Next » 

Revision 544878ef

Added by Patrick Plitzner over 10 years ago

  • DataImportSpecimenEditorInput now call cdmlib-ext to query BioCASE provider and calls cmlib-io to use ABCD-import for converting ABCD into SpecimenOrObservationBase objects
    • implemented TransientCdmRepository an TransientOccurenceService for that

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.java
22 22

  
23 23
import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery;
24 24
import eu.etaxonomy.cdm.ext.biocase.BioCaseQueryServiceWrapper;
25
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206Import;
25
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
26
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
26 27
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
28
import eu.etaxonomy.taxeditor.store.CdmStore;
27 29

  
28 30
/**
29 31
 * @author pplitzner
......
34 36

  
35 37
    private static Logger logger = Logger.getLogger(DataImportSpecimenEditorInput.class);
36 38

  
37
    private List<SpecimenOrObservationBase> results;
38 39
    private BioCaseQuery query;
39 40

  
40 41
    /**
......
42 43
     */
43 44
    public DataImportSpecimenEditorInput(BioCaseQuery query) {
44 45
        this.query = query;
46
        this.query.taxonName = "Campanula*";
45 47
    }
46 48

  
47 49
    /* (non-Javadoc)
......
98 100
     * @return the results
99 101
     */
100 102
    public List<SpecimenOrObservationBase> getResults() {
103
        List<SpecimenOrObservationBase> results = null;
101 104
        String errorMessage = "Could not execute query " + query;
102 105
        try {
103 106
            InputStream resultStream = new BioCaseQueryServiceWrapper().query(query);
104
            Abcd206Import abcd206Import = new Abcd206Import();
107
            Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, false);
108
            TransientCdmRepository repo = new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
109
            configurator.setCdmAppController(repo);
110

  
111
            CdmDefaultImport<Abcd206ImportConfigurator> importer = new CdmDefaultImport<Abcd206ImportConfigurator>();
112
            importer.invoke(configurator);
113
            results = repo.getUnits();
114
//            Abcd206Import abcd206Import = new Abcd206Import();
115
//            Abcd206ImportState state = new Abcd206ImportState(configurator);
116
//            abcd206Import.invoke(state);
117
//            state.countTrees();
105 118
        } catch (ClientProtocolException e) {
106 119
            logger.error(errorMessage, e);
107 120
        } catch (IOException e) {
......
109 122
        } catch (URISyntaxException e) {
110 123
            logger.error(errorMessage, e);
111 124
        }
112
        return new BioCaseQueryServiceWrapper().dummyData();
125
//        return new BioCaseQueryServiceWrapper().dummyData();
126
        return results;
113 127
    }
114 128

  
115 129
    /* (non-Javadoc)
......
145 159
        } else if (!query.equals(other.query)) {
146 160
            return false;
147 161
        }
148
        if (results == null) {
149
            if (other.results != null) {
150
                return false;
151
            }
152
        }
153 162
        return true;
154 163
    }
155 164

  

Also available in: Unified diff