Project

General

Profile

Revision 58ea183c

ID58ea183cae4f0a2b851104246a32a9296cc0ddf2
Parent 9d192006
Child 67146e56

Added by Andreas Müller 5 months ago

ref #8651 smaller changes to distribution accumulation webservice

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
159 159
    @RequestMapping(value = { "accumulateDistributions" }, method = RequestMethod.GET)
160 160
    public ModelAndView doAccumulateDistributions(
161 161
            @RequestParam(value= "mode", required = true) final AggregationMode mode,
162
            @RequestParam(value = "targetAreaLevel", required = true) UUID targetAreaLevelUuid,
162 163
            @RequestParam(value = "frontendBaseUrl", required = false) String frontendBaseUrl,
163 164
            @RequestParam(value = "priority", required = false) Integer priority,
164
            @RequestParam(value = "targetAreaLevel", required = true) final NamedAreaLevel targetAreaLevel,
165 165
//            @RequestParam(value = "lowerRank", required = false) Rank lowerRank,
166 166
//            @RequestParam(value = "upperRank", required = false) Rank upperRank,
167

  
168
            @RequestParam(value = "subtrees", required = false) final UuidList subtreeUuids,
169
//            @RequestParam(value = "clearCache", required = false) final boolean clearCache,
170
            @RequestParam(value = "classifications", required = false) final UuidList classificationUuids,
171
            @RequestParam(value = "taxa", required = false) final UuidList taxonUuids,
172
            @RequestParam(value = "taxonnodes", required = false) final UuidList taxonNodeUuids,
173
//            @RequestParam(value = "includeUnpublished", defaultValue="false") Boolean includeUnpublished,  //for now we do not allow unpublished data to be exported via webservice as long as read authentication is not implemented
174

  
175
//            @RequestParam(value = "area", required = false) final UuidList areaUuids,
176 167
            @RequestParam(value = "minRank", required = false) UUID lowerRank,
177
            @RequestParam(value = "maxRank", required = false) final UUID upperRank,
178

  
168
            @RequestParam(value = "maxRank", required = false) UUID upperRank,
169
            @RequestParam(value = "subtrees", required = false) UuidList subtreeUuids,
170
            @RequestParam(value = "classifications", required = false) UuidList classificationUuids,
171
            @RequestParam(value = "taxa", required = false) UuidList taxonUuids,
172
            @RequestParam(value = "taxonnodes", required = false) UuidList taxonNodeUuids,
173
//            @RequestParam(value = "includeUnpublished", defaultValue="false") Boolean includeUnpublished,  //for now we do not allow unpublished data to be exported via webservice as long as read authentication is not implemented
174
//            @RequestParam(value = "area", required = false) UuidList areaUuids,
179 175
            HttpServletRequest request,
180 176
            HttpServletResponse response) throws IOException {
181 177

  
......
185 181

  
186 182
        String processLabel = "accumulating distributions";
187 183

  
188
//        final UUID lowerRankUuid = lowerRank != null ? lowerRank.getUuid() : null; //Rank.UNKNOWN_RANK(); // this is the lowest rank
189
//        final UUID upperRankUuid = upperRank != null ? upperRank.getUuid() : null; // Rank.GENUS();
190

  
191 184
        ProgressMonitorUtil progressUtil = new ProgressMonitorUtil(progressMonitorController);
192 185

  
193 186
        final List<String> term_init_strategy = Arrays.asList(new String []{
194 187
                "representations"
195 188
        });
189
        NamedAreaLevel targetAreaLevel = (NamedAreaLevel)termService.load(targetAreaLevelUuid, term_init_strategy);
196 190

  
197 191
        if (!progressMonitorController.isMonitorRunning(transmissionEngineMonitorUuid)) {
198 192
            transmissionEngineMonitorUuid = progressUtil.registerNewMonitor();

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)