Admin / Harvesting / Order options according to processing.

web-ui/src/main/resources/catalog/components/admin/harvester/HarvesterDirective.js

@@ -270,15 +270,15 @@
   module.directive('gnHarvesterExtras',
       ['$http', '$translate', '$rootScope',
         function($http, $translate, $rootScope) {
-
           return {
             restrict: 'A',
             replace: false,
             templateUrl: '../../catalog/components/admin/harvester/partials/' +
                 'extras.html',
-
+            scope: {
+              harvester: '=gnHarvesterExtras'
+            },
             link: function(scope, element, attrs) {
-
               $http.get('../api/languages', {cache: true})
                   .success(function(data) {
                     scope.languages = data;

web-ui/src/main/resources/catalog/components/admin/harvester/partials/extras.html

@@ -1,6 +1,10 @@
-<div>
-  <div data-ng-show="harvester['@type'] == 'webdav' || harvester['@type'] == 'geonetwork' || harvester['@type'] == 'csw'
-    || harvester['@type'] == 'oaipmh' || harvester['@type'] == 'filesystem'">
+<fieldset>
+  <legend data-translate="">uuidMergePolicy</legend>
+  <div data-ng-show="harvester['@type'] == 'webdav'
+                     || harvester['@type'] == 'geonetwork'
+                     || harvester['@type'] == 'csw'
+                     || harvester['@type'] == 'oaipmh'
+                     || harvester['@type'] == 'filesystem'">
     <label class="control-label">
       <span data-translate="">{{"harvesterOverrideUUID" | translate}}</span>
     </label>
@@ -12,4 +16,4 @@
     </select>
     <span class="help-block ng-scope" data-translate="">harvesterOverrideUUIDHelp</span>
   </div>
-</div>
+</fieldset>

web-ui/src/main/resources/catalog/components/admin/harvester/partials/identification.html

@@ -1,5 +1,8 @@
 <fieldset>
-  <legend data-translate="">harvesterIdentification</legend>
+  <legend>
+    <i class="fa fa-fw fa-info-circle"></i>
+    <span data-translate="">harvesterIdentification</span>
+  </legend>
   <div id="gn-harvest-settings-selected-name-row"
        data-ng-class="
         $parent.harvesterForm.harvesterSiteName.$error.required ||
@@ -61,5 +64,4 @@
 
     <p class="help-block" data-translate="">harvesterUserHelp</p>
   </div>
-  <div data-gn-harvester-extras="">
 </fieldset>

web-ui/src/main/resources/catalog/components/admin/harvester/partials/privileges.html

@@ -1,5 +1,8 @@
 <fieldset>
-  <legend id="gn-harvest-settings-gn-priviliges-title" data-translate="">harvestedRecordPrivileges</legend>
+  <legend id="gn-harvest-settings-gn-priviliges-title">
+    <i class="fa fa-fw fa-unlock"></i>
+    <span data-translate="">harvestedRecordPrivileges</span>
+  </legend>
 
 
   <div id="gn-harvest-settings-gn-priviliges-ifRecordExistAppendPrivileges"

web-ui/src/main/resources/catalog/components/admin/harvester/partials/schedule.html

@@ -1,5 +1,6 @@
 <fieldset>
   <legend id="gn-harvest-settings-selected-schedule-title">
+    <i class="fa fa-fw fa-clock-o"></i>
     <span data-translate="">harvesterSchedule</span>
 
     <div id="gn-harvest-settings-selected-schedule-buttons" class="btn-group btn-group-sm pull-right gn-margin-bottom" data-toggle="buttons">

web-ui/src/main/resources/catalog/locales/en-admin.json

@@ -469,7 +469,7 @@
     "harvester-webdavHelp": "Harvest from a remote WebDAV or WAF server",
     "harvester-wfsfeatures": "OGC WFS GetFeature",
     "harvester-wfsfeaturesHelp": "Create metadata records or directory entries from WFS features.",
-    "harvesterAdvancedConfigurationFor": "Advanced options for protocol ",
+    "harvesterResponseProcessing": "Configure response processing for ",
     "harvesterError": "Harvest error",
     "harvesterFilter": "Search filter",
     "harvesterGroup": "Group",
@@ -481,7 +481,7 @@
     "harvesterIconHelp": "Image describing the remote node.",
     "harvesterIdentification": "Identification",
     "harvesterIsRunning": "Harvester is running!",
-    "harvesterMainConfigurationFor": "Configuration for protocol ",
+    "harvesterConnectionConfiguration": "Configure connection to ",
     "harvesterName": "Node name",
     "harvesterNameHelp": "The name describing the remote node.",
     "harvesterOverrideUUID" : "Action on UUID collision",

web-ui/src/main/resources/catalog/locales/en-v4.json

@@ -299,5 +299,8 @@
   "harvesterConfigIsNotJson": "The harvester config must be a JSON configuration.",
   "harvesterConfigIsNotValid": "The harvester config does not look to be a valid configuration.",
   "specificationConformance": "Specification conformance",
-  "toggleOptions": "Toggle filter options (open or close filter tree)"
+  "toggleOptions": "Toggle filter options (open or close filter tree)",
+  "uuidMergePolicy": "UUID merge policy",
+  "filteringAndProcessing": "Filtering and processing response",
+  "recordCreationOptions": "Record creation options"
 }

web-ui/src/main/resources/catalog/templates/admin/harvest/type/arcsde.html

@@ -8,7 +8,7 @@
   </div>
 
   <fieldset id="gn-harvest-settings-sde-basic-row">
-    <legend id="gn-harvest-settings-sde-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-sde-basic-title"><i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
     <div id="gn-harvest-settings-sde-basic-server-row" data-ng-class="harvesterSelected.site.server == '' ? 'has-error' : ''">
@@ -67,7 +67,7 @@
   </fieldset>
 
   <fieldset id="gn-harvest-settings-sde-advanced-row">
-    <legend id="gn-harvest-settings-sde-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-sde-advanced-title"><i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 

web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html

@@ -9,10 +9,12 @@
 
 
   <fieldset id="gn-harvest-settings-csw-basic-row">
-    <legend id="gn-harvest-settings-csw-basic-title"><span data-translate="">harvesterMainConfigurationFor</span> {{('harvester-' +
+    <legend id="gn-harvest-settings-csw-basic-title">
+      <i class="fa fa-fw fa-plug"></i><span data-translate="">harvesterConnectionConfiguration</span> {{('harvester-' +
       harvesterSelected['@type']) | translate}}
     </legend>
-    <div id="gn-harvest-settings-csw-basic-service-row" data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
+    <div id="gn-harvest-settings-csw-basic-service-row"
+         data-ng-class="harvesterSelected.site.url == '' ? 'has-error' : ''">
       <label id="gn-harvest-settings-csw-basic-service-label" class="control-label" data-translate="">serviceUrl</label>
       <input id="gn-harvest-settings-csw-basic-service-input"
              type="text"
@@ -21,6 +23,11 @@
       <p class="help-block" data-translate="">csw-capabilitiesUrlHelp</p>
     </div>
 
+
+    <div id="gn-harvest-settings-csw-advanced-authentication-row"
+         data-gn-harvester-account="harvesterSelected"/>
+
+
     <fieldset id="gn-harvest-settings-csw-basic-service-criteria-row" class="form-horizontal cswCriteriaInfo">
       <legend id="gn-harvest-settings-csw-basic-service-criteria-title" data-translate="">harvesterFilter</legend>
 
@@ -73,134 +80,140 @@
       </div>
     </fieldset>
 
+    <fieldset id="gn-harvest-settings-csw-basic-service-search-option-row"
+              class="form-horizontal cswCriteriaInfo">
+      <legend id="gn-harvest-settings-csw-basic-service-search-option-title" data-translate="">searchOptions</legend>
 
-    <hr/>
-    <div id="gn-harvest-settings-csw-xpath-filter-title-row">
-      <label id="gn-harvest-settings-csw-xpath-filter-title-label" class="control-label col-lg-4" data-translate="">xpathFilter</label>
-      <div class="col-lg-8">
-        <input id="gn-harvest-settings-csw-xpath-filter-title-input"
+      <div id="gn-harvest-settings-csw-advanced-sortBy-row">
+        <label id="gn-harvest-settings-csw-advanced-sortBy-label"
+               class="control-label"
+               data-translate="">sortBy</label>
+        <input id="gn-harvest-settings-csw-advanced-sortBy-input"
                type="text"
-               class="form-control"
-               data-ng-model="harvesterSelected.site.xpathFilter"/>
+               class="form-control gn-csw-criteria"
+               data-ng-model="harvesterSelected.site.sortBy"/>
+        <p class="help-block" data-translate="">csw-sortByHelp</p>
       </div>
-      <p class="help-block" data-translate="">xpathFilter-help</p>
-    </div>
 
+      <div id="gn-harvest-settings-csw-advanced-scheme-row">
+        <div class="row">
+          <div id="gn-harvest-settings-csw-advanced-scheme-output-row"
+               class="col-lg-8 col-md-8 col-sm-8 gn-nopadding-left gn-nopadding-right">
+            <label id="gn-harvest-settings-csw-advanced-scheme-output-label" class="control-label" data-translate="">csw-outputSchema</label>
+            <input id="gn-harvest-settings-csw-advanced-scheme-output-input" type="text" class="form-control gn-csw-criteria" id="csw-outputSchemaInput"
+                   data-ng-model="harvesterSelected.site.outputSchema"/>
+          </div>
+          <div id="gn-harvest-settings-csw-advanced-scheme-recommended-row"
+               class="col-lg-4 col-md-4 col-sm-4 hidden-xs gn-nopadding-right">
+            <label id="gn-harvest-settings-csw-advanced-scheme-recommended-label" class="control-label" data-translate="">csw-outputSchemaOptions</label>
+            <select id="gn-harvest-settings-csw-advanced-scheme-recommended-list"
+                    data-ng-model="harvesterSelected.site.outputSchema"
+                    class="form-control gn-csw-criteria"
+                    id="csw-outputSchemaOptionsSelect">
+              <option value="" disabled="" data-translate="">csw-recommendedValues</option>
+              <option value="http://www.opengis.net/cat/csw/2.0.2" data-translate="">csw-dublinCore</option>
+              <option value="http://www.isotc211.org/2005/gmd" data-translate="">csw-iso19139</option>
+              <option value="http://standards.iso.org/iso/19115/-3/mdb/2.0">ISO 19115-3</option>
+            </select>
+          </div>
+        </div>
+        <p class="help-block" data-translate="">csw-outputSchemaHelp</p>
+      </div>
+
+      <div>
+        <label class="control-label">
+          <input id="gn-harvest-settings-gn-advanced-distributedsearch-checkbox"
+                 type="checkbox" data-ng-true-value="'distributed'" data-ng-false-value="'local'"
+                 data-ng-model="harvesterSelected.site.queryScope"/>
+          <span id="gn-harvest-settings-gn-advanced-distributedsearch-label" data-translate="">distributedSearch</span>
+        </label>
+
+        <fieldset data-ng-show="harvesterSelected.site.queryScope == 'distributed'">
+          <div class="well">
+            <div id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-row">
+              <label id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-label" class="control-label" data-translate="">hopCount</label>
+              <input id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-input"
+                     type="number" data-gn-string-to-number
+                     class="form-control"
+                     data-ng-model="harvesterSelected.site.hopCount"/>
+
+              <p class="help-block" data-translate="">hopCountHelp</p>
+            </div>
+          </div>
+        </fieldset>
+
+        <p class="help-block" data-translate="">distributedSearchHelp</p>
+      </div>
+    </fieldset>
   </fieldset>
 
 
   <fieldset id="gn-harvest-settings-csw-advanced-row">
-    <legend id="gn-harvest-settings-csw-advanced-title"><span data-translate="">harvesterAdvancedConfigurationFor</span>
+    <legend id="gn-harvest-settings-csw-advanced-title">
+      <i class="fa fa-fw fa-cogs"></i><span data-translate="">harvesterResponseProcessing</span>
       {{harvesterSelected['@type'] | translate}}
     </legend>
 
-    <div id="gn-harvest-settings-csw-advanced-authentication-row" data-gn-harvester-account="harvesterSelected"/>
-
-    <div id="gn-harvest-settings-csw-advanced-duplicate-row">
-      <label class="control-label">
-        <input id="gn-harvest-settings-csw-advanced-duplicate-checkbox"
-               type="checkbox"
-               data-ng-model="harvesterSelected.site.rejectDuplicateResource"/>
-        <span id="gn-harvest-settings-csw-advanced-duplicate-label" data-translate="">csw-rejectDuplicateResource</span>
-      </label>
-      <p class="help-block" data-translate="">csw-rejectDuplicateResourceHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-category-row" data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
-         data-label="csw-category"/>
+    <div data-gn-harvester-extras="harvesterSelected"></div>
 
+    <fieldset>
+      <legend data-translate="">filteringAndProcessing</legend>
+      <div id="gn-harvest-settings-csw-xpath-filter-title-row">
 
-    <div id="gn-harvest-settings-csw-advanced-validate-row">
-      <label id="gn-harvest-settings-csw-advanced-validate-label" class="control-label">
-        <span data-translate="">harvesterValidate</span>
-      </label>
-      <div id="gn-harvest-settings-csw-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
-      <p class="help-block" data-translate="">harvesterValidateHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-batchEdits-row">
-      <label id="gn-harvest-settings-csw-advanced-batchEdits-label" class="control-label">
-        <span data-translate="">harvesterBatchEdits</span>
-      </label>
-      <div id="gn-harvest-settings-csw-advanced-validate-list"
-           style="height: 300px"
-           ui-ace="{useWrapMode:true, showGutter:true, mode:'json'}"
-           data-ng-model="harvesterSelected.content.batchEdits"/>
-      <p class="help-block" data-translate="">harvesterBatchEditsHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-xsl-row">
-      <label id="gn-harvest-settings-csw-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
-      <div id="gn-harvest-settings-csw-advanced-xsl-list"
-           data-gn-import-xsl="harvesterSelected.site.xslfilter"
-           data-mode="btn-group"/>
-
-      <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
-    </div>
-
-    <div id="gn-harvest-settings-csw-advanced-sortBy-row">
-      <label id="gn-harvest-settings-csw-advanced-sortBy-label"
-             class="control-label"
-             data-translate="">sortBy</label>
-      <input id="gn-harvest-settings-csw-advanced-sortBy-input"
-             type="text"
-             class="form-control gn-csw-criteria"
-             data-ng-model="harvesterSelected.site.sortBy"/>
-      <p class="help-block" data-translate="">csw-sortByHelp</p>
-    </div>
+        <div id="gn-harvest-settings-csw-advanced-validate-row">
+          <label id="gn-harvest-settings-csw-advanced-validate-label" class="control-label">
+            <span data-translate="">harvesterValidate</span>
+          </label>
+          <div id="gn-harvest-settings-csw-advanced-validate-list" data-gn-harvester-validation="harvesterSelected.content.validate"/>
+          <p class="help-block" data-translate="">harvesterValidateHelp</p>
+        </div>
 
-    <div id="gn-harvest-settings-csw-advanced-scheme-row">
-      <div class="row">
-        <div id="gn-harvest-settings-csw-advanced-scheme-output-row"
-             class="col-lg-8 col-md-8 col-sm-8 gn-nopadding-left gn-nopadding-right">
-          <label id="gn-harvest-settings-csw-advanced-scheme-output-label" class="control-label" data-translate="">csw-outputSchema</label>
-          <input id="gn-harvest-settings-csw-advanced-scheme-output-input" type="text" class="form-control gn-csw-criteria" id="csw-outputSchemaInput"
-                 data-ng-model="harvesterSelected.site.outputSchema"/>
+        <div id="gn-harvest-settings-csw-advanced-duplicate-row">
+          <label class="control-label">
+            <input id="gn-harvest-settings-csw-advanced-duplicate-checkbox"
+                   type="checkbox"
+                   data-ng-model="harvesterSelected.site.rejectDuplicateResource"/>
+            <span id="gn-harvest-settings-csw-advanced-duplicate-label" data-translate="">csw-rejectDuplicateResource</span>
+          </label>
+          <p class="help-block" data-translate="">csw-rejectDuplicateResourceHelp</p>
         </div>
-        <div id="gn-harvest-settings-csw-advanced-scheme-recommended-row"
-             class="col-lg-4 col-md-4 col-sm-4 hidden-xs gn-nopadding-right">
-          <label id="gn-harvest-settings-csw-advanced-scheme-recommended-label" class="control-label" data-translate="">csw-outputSchemaOptions</label>
-          <select id="gn-harvest-settings-csw-advanced-scheme-recommended-list"
-                  data-ng-model="harvesterSelected.site.outputSchema"
-                  class="form-control gn-csw-criteria"
-                  id="csw-outputSchemaOptionsSelect">
-            <option value="" disabled="" data-translate="">csw-recommendedValues</option>
-            <option value="http://www.opengis.net/cat/csw/2.0.2" data-translate="">csw-dublinCore</option>
-            <option value="http://www.isotc211.org/2005/gmd" data-translate="">csw-iso19139</option>
-            <option value="http://standards.iso.org/iso/19115/-3/mdb/2.0">ISO 19115-3</option>
-          </select>
+
+        <label id="gn-harvest-settings-csw-xpath-filter-title-label" class="control-label col-lg-4" data-translate="">xpathFilter</label>
+        <div class="col-lg-8">
+          <input id="gn-harvest-settings-csw-xpath-filter-title-input"
+                 type="text"
+                 class="form-control"
+                 data-ng-model="harvesterSelected.site.xpathFilter"/>
         </div>
+        <p class="help-block" data-translate="">xpathFilter-help</p>
       </div>
-      <p class="help-block" data-translate="">csw-outputSchemaHelp</p>
-    </div>
-  </fieldset>
 
+      <div id="gn-harvest-settings-csw-advanced-xsl-row">
+        <label id="gn-harvest-settings-csw-advanced-xsl-label" class="control-label" data-translate="">applyXSLToRecord</label>
+        <div id="gn-harvest-settings-csw-advanced-xsl-list"
+             data-gn-import-xsl="harvesterSelected.site.xslfilter"
+             data-mode="btn-group"/>
 
-  <div>
-    <label class="control-label">
-      <input id="gn-harvest-settings-gn-advanced-distributedsearch-checkbox"
-             type="checkbox" data-ng-true-value="'distributed'" data-ng-false-value="'local'"
-             data-ng-model="harvesterSelected.site.queryScope"/>
-      <span id="gn-harvest-settings-gn-advanced-distributedsearch-label" data-translate="">distributedSearch</span>
-    </label>
-
-    <fieldset data-ng-show="harvesterSelected.site.queryScope == 'distributed'">
-      <div class="well">
-        <div id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-row">
-          <label id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-label" class="control-label" data-translate="">hopCount</label>
-          <input id="gn-harvest-settings-gn-advanced-distributedsearch-hopcount-input"
-                 type="number" data-gn-string-to-number
-                 class="form-control"
-                 data-ng-model="harvesterSelected.site.hopCount"/>
+        <p class="help-block" data-translate="">applyXSLToRecordHelp</p>
+      </div>
 
-          <p class="help-block" data-translate="">hopCountHelp</p>
-        </div>
+      <div id="gn-harvest-settings-csw-advanced-batchEdits-row">
+        <label id="gn-harvest-settings-csw-advanced-batchEdits-label" class="control-label">
+          <span data-translate="">harvesterBatchEdits</span>
+        </label>
+        <div id="gn-harvest-settings-csw-advanced-batchEdits-list"
+             style="height: 300px"
+             ui-ace="{useWrapMode:true, showGutter:true, mode:'json'}"
+             data-ng-model="harvesterSelected.content.batchEdits"/>
+        <p class="help-block" data-translate="">harvesterBatchEditsHelp</p>
       </div>
     </fieldset>
 
-    <p class="help-block" data-translate="">distributedSearchHelp</p>
-  </div>
-
+    <div id="gn-harvest-settings-csw-advanced-category-row" data-gn-category="harvesterSelected.categories[0]['@id']" data-lang="{{lang}}"
+         data-label="csw-category"/>
+  </fieldset>
 
-  <div id="gn-harvest-settings-csw-privileges-row" data-gn-harvester-privileges="harvesterSelected" data-lang="{{lang}}"/>
+  <div id="gn-harvest-settings-csw-privileges-row"
+       data-gn-harvester-privileges="harvesterSelected"
+       data-lang="{{lang}}"/>
 </form>