Project

General

Profile

« Previous | Next » 

Revision c268fd2e

Added by Andreas Müller almost 5 years ago

ref #7346 adapt E+M area import to work correctly

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAreaImport.java
64 64

  
65 65
	@Override
66 66
	protected String getIdQuery(BerlinModelImportState state) {
67
		String result =
68
		          " SELECT AreaId "
69
		        + " FROM " + getTableName();
70
		if (state.getConfig().isEuroMed()){
71
		    result += " WHERE AreaID NOT IN (1, 21, 650, 653, 1718, 654, 646, 647) ";  //#3986
72
		}
73
		return result;
67
//		String result =
68
//		          " SELECT AreaId "
69
//		        + " FROM " + getTableName();
70
//		if (state.getConfig().isEuroMed()){
71
//		    result += " WHERE AreaID NOT IN (1, 21, 650, 653, 1718, 654, 646, 647) ";  //#3986
72
//		}
73
//		return result;
74
	    return null; //not relevant as we have no partitioning here
74 75
	}
75 76

  
76 77
	@Override
77 78
	protected String getRecordQuery(BerlinModelImportConfigurator config) {
78
		String strQuery =
79
		          " SELECT * "
80
		        + " FROM emArea a "
81
                + " WHERE (a.AreaId IN (" + ID_LIST_TOKEN + ")  )"
82
		        + " ORDER BY a.AreaId "
83
                ;
84
		return strQuery;
79
//		String strQuery =
80
//		          " SELECT * "
81
//		        + " FROM emArea a "
82
//                + " WHERE (a.AreaId IN (" + ID_LIST_TOKEN + ")  )"
83
//		        + " ORDER BY a.AreaId "
84
//                ;
85
//		return strQuery;
86
	    return null;  //not relevant as we have no partitioning here
85 87
	}
86 88

  
87 89
	private Map<Integer, NamedArea> euroMedAreas = new HashMap<>();
88 90

  
89 91

  
92
    /**
93
     * {@inheritDoc}
94
     */
95
    @Override
96
    public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state) {
97
        // not relevant
98
        return true;
99
    }
100

  
90 101
    @Override
91
    public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state)  {
102
    public void doInvoke(BerlinModelImportState state)  {
92 103
        TermVocabulary<?> voc = getVocabularyService().find(BerlinModelTransformer.uuidVocEuroMedAreas);
93 104
        if (voc == null){
94 105
            try {
......
99 110
                e.printStackTrace();
100 111
            }
101 112
        }
102
        return true;
113
        return;
103 114
    }
104 115

  
105 116

  
......
128 139

  
129 140
		String sql = "SELECT * , CASE WHEN EMCode = 'EM' THEN 'a' ELSE 'b' END as isEM " +
130 141
				" FROM emArea " +
131
				" WHERE areaId not IN (14, 20, 21, 33, 1, 646, 647, 653, 1718, 654) " +
142
				" WHERE areaId not IN (1, 14, 20, 21, 33, 646, 647, 653, 654, 1718) " +
132 143
				" ORDER BY isEM, EMCode";
133 144
		ResultSet rs = source.getResultSet(sql);
134 145

  
......
517 528
		}
518 529
	}
519 530

  
531

  
520 532
}

Also available in: Unified diff