Revision a5767950
Added by Andreas Müller over 11 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSiteImagesImport.java | ||
---|---|---|
67 | 67 |
protected String getRecordQuery(BerlinModelImportConfigurator config) { |
68 | 68 |
String strQuery = |
69 | 69 |
|
70 |
" SELECT si.*, si.Comment as FigurePhrase, si.Picture as fileName " + |
|
70 |
" SELECT si.*, si.Comment as FigurePhrase, si.PictureFile as fileName " +
|
|
71 | 71 |
" FROM SiteImages si " |
72 | 72 |
+ " WHERE (si.SiteID IN (" + ID_LIST_TOKEN + ") )" |
73 | 73 |
+ " ORDER BY EcoFactFk "; |
... | ... | |
98 | 98 |
|
99 | 99 |
if ((i++ % modCount) == 0 && i!= 1 ){ logger.info(pluralString + " handled: " + (i-1));} |
100 | 100 |
|
101 |
int figureId = rs.getInt("VoucherImageID");
|
|
101 |
int figureId = rs.getInt("SiteId");
|
|
102 | 102 |
int ecoFactFk = rs.getInt("EcoFactFk"); |
103 | 103 |
|
104 | 104 |
|
... | ... | |
107 | 107 |
try { |
108 | 108 |
|
109 | 109 |
//TODO use deduplicated ecofact |
110 |
FieldObservation fieldObservation = ecoFactFieldObservationMap.get(ecoFactFk);
|
|
110 |
FieldObservation fieldObservation = ecoFactFieldObservationMap.get(String.valueOf(ecoFactFk));
|
|
111 | 111 |
|
112 | 112 |
if (fieldObservation == null){ |
113 | 113 |
logger.warn("Could not find eco fact field observation (" + ecoFactFk +") for site image " + figureId); |
... | ... | |
118 | 118 |
//field observation |
119 | 119 |
Media media = handleSingleImage(rs, fieldObservation, state, partitioner); |
120 | 120 |
|
121 |
handleTypeImageSpecificFields(rs, media, state);
|
|
121 |
handleSiteImageSpecificFields(rs, media, state);
|
|
122 | 122 |
|
123 | 123 |
unitsToSave.add(fieldObservation); |
124 | 124 |
|
... | ... | |
144 | 144 |
|
145 | 145 |
|
146 | 146 |
|
147 |
private void handleTypeImageSpecificFields(ResultSet rs, Media media, AlgaTerraImportState state) throws SQLException {
|
|
147 |
private void handleSiteImageSpecificFields(ResultSet rs, Media media, AlgaTerraImportState state) throws SQLException {
|
|
148 | 148 |
//TODO |
149 | 149 |
|
150 | 150 |
} |
Also available in: Unified diff
Latest AlgaTerra Import developments