Index: src/org/fao/geonet/constants/Geonet.java =================================================================== --- src/org/fao/geonet/constants/Geonet.java (revision 5829) +++ src/org/fao/geonet/constants/Geonet.java (working copy) @@ -45,6 +45,7 @@ public static final String SEARCH_Z3950_CLIENT = "z3950Client.xsl"; public static final String SEARCH_Z3950_SERVER = "z3950Server.xsl"; public static final String UPDATE_FIXED_INFO = "update-fixed-info.xsl"; + public static final String UPDATE_CHILD_FROM_PARENT_INFO = "update-child-from-parent-info.xsl"; public static final String EXTRACT_UUID = "extract-uuid.xsl"; public static final String SET_UUID = "set-uuid.xsl"; public static final String EXTRACT_THUMBNAILS = "extract-thumbnails.xsl"; Index: src/org/fao/geonet/kernel/DataManager.java =================================================================== --- src/org/fao/geonet/kernel/DataManager.java (revision 5829) +++ src/org/fao/geonet/kernel/DataManager.java (working copy) @@ -52,6 +52,7 @@ import org.fao.geonet.constants.Edit; import org.fao.geonet.constants.Geonet; +import org.fao.geonet.constants.Params; import org.fao.geonet.csw.common.Csw; import org.fao.geonet.kernel.harvest.HarvestManager; import org.fao.geonet.kernel.schema.MetadataSchema; @@ -827,7 +828,8 @@ */ public String createMetadata(Dbms dbms, String templateId, String groupOwner, - SerialFactory sf, String source, int owner) throws Exception + SerialFactory sf, String source, int owner, + String parentUuid) throws Exception { String query = "SELECT schemaId, data FROM Metadata WHERE id="+ templateId; @@ -845,7 +847,7 @@ //--- generate a new metadata id int serial = sf.getSerial(dbms, "Metadata"); - Element xml = updateFixedInfoNew(schema, Integer.toString(serial), Xml.loadString(data, false), uuid); + Element xml = updateFixedInfoNew(schema, Integer.toString(serial), Xml.loadString(data, false), uuid, parentUuid); //--- store metadata @@ -2170,7 +2172,7 @@ //-------------------------------------------------------------------------- - public Element updateFixedInfoNew(String schema, String id, Element md, String uuid) throws Exception + public Element updateFixedInfoNew(String schema, String id, Element md, String uuid, String parentUuid) throws Exception { //--- setup environment - for new records @@ -2178,7 +2180,8 @@ env.addContent(new Element("id") .setText(id)); env.addContent(new Element("uuid") .setText(uuid)); - env.addContent(new Element("updateDateStamp") .setText("yes")); + env.addContent(new Element("parentUuid") .setText(parentUuid)); + env.addContent(new Element("updateDateStamp") .setText("yes")); return updateFixedInfo(schema, md, env); } @@ -2206,7 +2209,100 @@ } //-------------------------------------------------------------------------- + + /** + * Update all children of the selected parent. Some elements are protected + * in the children according to the stylesheet used in + * xml/schemas/[SCHEMA]/update-child-from-parent-info.xsl. + * + * Children MUST be editable and also in the same schema of the parent. + * If not, child is not updated. + * + * @param srvContext + * service context + * @param parentUuid + * parent uuid + * @param params + * parameters + * @param children + * children + * @return + * @throws Exception + */ + public Set updateChildren(ServiceContext srvContext, + String parentUuid, String[] children, Map params) + throws Exception { + Dbms dbms = (Dbms) srvContext.getResourceManager().open( + Geonet.Res.MAIN_DB); + String parentId = params.get(Params.ID); + String parentSchema = params.get(Params.SCHEMA); + + // --- get parent metadata in read/only mode + Element parent = getMetadata(srvContext, parentId, false); + + Element env = new Element("update"); + env.addContent(new Element("parentUuid").setText(parentUuid)); + env.addContent(new Element("siteURL").setText(getSiteURL())); + env.addContent(new Element("parent").addContent(parent)); + + // Set of untreated children (out of privileges, different schemas) + Set untreatedChildSet = new HashSet(); + + // only get iso19139 records + for (String childId : children) { + + // Check privileges + if (!accessMan.canEdit(srvContext, childId)) { + untreatedChildSet.add(childId); + Log.debug(Geonet.DATA_MANAGER, "Could not update child (" + + childId + ") because of privileges."); + continue; + } + + Element child = getMetadata(srvContext, childId, false); + String childSchema = child.getChild(Edit.RootChild.INFO, + Edit.NAMESPACE).getChildText(Edit.Info.Elem.SCHEMA); + + // Check schema matching. CHECKME : this suppose that parent and + // child are in the same schema (even not profil different) + if (!childSchema.equals(parentSchema)) { + untreatedChildSet.add(childId); + Log.debug(Geonet.DATA_MANAGER, "Could not update child (" + + childId + ") because schema (" + childSchema + + ") is different from the parent one (" + parentSchema + + ")."); + continue; + } + + Log.debug(Geonet.DATA_MANAGER, "Updating child (" + childId +") ..."); + + // --- setup xml element to be processed by XSLT + + Element rootEl = new Element("root"); + Element childEl = new Element("child").addContent(child.detach()); + rootEl.addContent(childEl); + rootEl.addContent(env.detach()); + + // --- do an XSL transformation + + String styleSheet = editLib.getSchemaDir(parentSchema) + + Geonet.File.UPDATE_CHILD_FROM_PARENT_INFO; + Element childForUpdate = new Element("root"); + childForUpdate = Xml.transform(rootEl, styleSheet, params); + + XmlSerializer.update(dbms, childId, childForUpdate, new ISODate() + .toString()); + + rootEl = null; + } + + return untreatedChildSet; + } + + + //-------------------------------------------------------------------------- + private Element buildInfoElem(ServiceContext context, String id, String version) throws Exception { Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); Index: src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java =================================================================== --- src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java (revision 5829) +++ src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java (working copy) @@ -584,7 +584,7 @@ params.uuid, date, date, reg.uuid, 1, null); - xml = dataMan.updateFixedInfoNew(schema, reg.id, xml, params.uuid); + xml = dataMan.updateFixedInfoNew(schema, reg.id, xml, params.uuid, null); int iId = Integer.parseInt(reg.id); log.debug(" - Layer loaded in DB."); Index: src/org/fao/geonet/services/metadata/Create.java =================================================================== --- src/org/fao/geonet/services/metadata/Create.java (revision 5829) +++ src/org/fao/geonet/services/metadata/Create.java (working copy) @@ -24,6 +24,7 @@ package org.fao.geonet.services.metadata; import jeeves.constants.Jeeves; +import jeeves.exceptions.BadInputEx; import jeeves.interfaces.Service; import jeeves.resources.dbms.Dbms; import jeeves.server.ServiceConfig; @@ -54,21 +55,41 @@ public Element exec(Element params, ServiceContext context) throws Exception { GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); - - String template = Util.getParam(params, Params.ID); + DataManager dm = gc.getDataManager(); + Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + + String child = Util.getParam(params, Params.CHILD, "n"); + String id = ""; + String uuid = ""; + + // does the request contain a UUID ? + try { + uuid = Util.getParam(params, Params.UUID); + // lookup ID by UUID + id = dm.getMetadataId(context, uuid); + } + catch(BadInputEx x) { + try { + id = Util.getParam(params, Params.ID); + uuid = dm.getMetadataUuid(dbms, id); + } + // request does not contain ID + catch(BadInputEx xx) { + // give up + throw new Exception("Request must contain a UUID or an ID"); + } + } + String groupOwner= Util.getParam(params, Params.GROUP); //--- query the data manager - Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB); + String newId = dm.createMetadata(dbms, id, groupOwner, context.getSerialFactory(), + gc.getSiteId(), context.getUserSession().getUserIdAsInt(), + (child.equals("n")?null:uuid)); - DataManager dm = gc.getDataManager(); - - String id = dm.createMetadata(dbms, template, groupOwner, context.getSerialFactory(), - gc.getSiteId(), context.getUserSession().getUserIdAsInt()); - return new Element(Jeeves.Elem.RESPONSE) - .addContent(new Element(Geonet.Elem.ID).setText(id)); + .addContent(new Element(Geonet.Elem.ID).setText(newId)); } } Index: src/org/fao/geonet/services/metadata/UpdateChildren.java =================================================================== --- src/org/fao/geonet/services/metadata/UpdateChildren.java (revision 0) +++ src/org/fao/geonet/services/metadata/UpdateChildren.java (revision 0) @@ -0,0 +1,107 @@ +//============================================================================= +//=== Copyright (C) 2001-2007 Food and Agriculture Organization of the +//=== United Nations (FAO-UN), United Nations World Food Programme (WFP) +//=== and United Nations Environment Programme (UNEP) +//=== +//=== This program is free software; you can redistribute it and/or modify +//=== it under the terms of the GNU General Public License as published by +//=== the Free Software Foundation; either version 2 of the License, or (at +//=== your option) any later version. +//=== +//=== This program is distributed in the hope that it will be useful, but +//=== WITHOUT ANY WARRANTY; without even the implied warranty of +//=== MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +//=== General Public License for more details. +//=== +//=== You should have received a copy of the GNU General Public License +//=== along with this program; if not, write to the Free Software +//=== Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +//=== +//=== Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, +//=== Rome - Italy. email: geonetwork@osgeo.org +//============================================================================== + +package org.fao.geonet.services.metadata; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jeeves.constants.Jeeves; +import jeeves.interfaces.Service; +import jeeves.server.ServiceConfig; +import jeeves.server.context.ServiceContext; +import jeeves.utils.Util; + +import org.fao.geonet.GeonetContext; +import org.fao.geonet.constants.Geonet; +import org.fao.geonet.kernel.DataManager; +import org.jdom.Element; + + +//============================================================================= + +/** +* A simple service that returns all metadata find by the searcher that can be added +* This simple search are not stored in session and doesn't alter other search +* (using paging, ...) +* +* @see search parameters +*/ + +public class UpdateChildren implements Service +{ + //-------------------------------------------------------------------------- + //--- + //--- Init + //--- + //-------------------------------------------------------------------------- + + public void init(String appPath, ServiceConfig params) throws Exception + {} + + //-------------------------------------------------------------------------- + //--- + //--- API + //--- + //-------------------------------------------------------------------------- + + public Element exec(Element params, ServiceContext context) throws Exception + { + String parentUuid = Util.getParam(params,"parentUuid"); + String childrenIds = Util.getParam(params, "childrenIds"); + + // Transform params element into Map for xsl transformation + List lstParams = params.getChildren(); + Map parameters = new HashMap(); + for (Element param : lstParams) { + parameters.put(param.getName(), param.getTextTrim()); + } + + // Handle children IDs. + String[] children = childrenIds.split(","); + + // Update children + GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); + DataManager dm = gc.getDataManager(); + + Set untreatedChildren = dm.updateChildren(context, parentUuid, children, parameters); + + Element response = new Element(Jeeves.Elem.RESPONSE); + int treatedChildren = children.length; + String untreatedReport = ""; + if (untreatedChildren.size() != 0) { + treatedChildren = children.length - untreatedChildren.size(); + untreatedReport = untreatedChildren.size() +" child/children not updated"; + for (String id : untreatedChildren) + untreatedReport += ", "+id; + } + + String report = treatedChildren + " child/children updated for metadata " + parentUuid + ". " + untreatedReport; + + return response.setText(report); + } +} + +//============================================================================= \ No newline at end of file Index: web/geonetwork/geonetwork.css =================================================================== --- web/geonetwork/geonetwork.css (revision 5897) +++ web/geonetwork/geonetwork.css (working copy) @@ -8,7 +8,7 @@ font-size: 100%; /* without this font sizes are not inherited correctly */ } -body { +body, div { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9pt; margin: 0px; @@ -463,6 +463,7 @@ opacity: .9; filter: alpha(opacity=90); -moz-opacity: 0.9; + z-index:1; } .oAcEle button { @@ -875,3 +876,20 @@ .validationReportIcon { background-image: url('images/schematron.gif') !important; } .shortcutHelpIcon { background-image: url('images/schematron.gif') !important; } .linkIcon { background-image: url('images/link.png') !important; } + + +div.modalbox{ + padding: 3px; +} + +div.modalbox * label { + padding-left: 5px; +} + +div.modalbox * li { + font-size: small +} + +div.modalbox * li * li { + font-size: smaller +} \ No newline at end of file Index: web/geonetwork/WEB-INF/config-metadata.xml =================================================================== --- web/geonetwork/WEB-INF/config-metadata.xml (revision 5829) +++ web/geonetwork/WEB-INF/config-metadata.xml (working copy) @@ -311,6 +311,17 @@ + + + + + + + + + + + Index: web/geonetwork/WEB-INF/user-profiles.xml =================================================================== --- web/geonetwork/WEB-INF/user-profiles.xml (revision 5829) +++ web/geonetwork/WEB-INF/user-profiles.xml (working copy) @@ -156,6 +156,8 @@ + + Index: web/geonetwork/loc/en/xml/strings.xml =================================================================== --- web/geonetwork/loc/en/xml/strings.xml (revision 5829) +++ web/geonetwork/loc/en/xml/strings.xml (working copy) @@ -10,6 +10,37 @@ Русский Рortuguês + Other actions + Create child + Update children + Children updated + Children update failed + Update children + Choose the strategy applied for children update from parent : + Add sections + Replace sections + +
+

More details

+ Update all children related to current metadata record. Select the + strategy to be applied on each main sections. +
+
+ Add will preserve child section and add the parent equivalent + section after the child ones. + Replace will remove child section by parent equivalent section. +
+
+ Children identifier, character set, language, parent identifier, + hierarchy level, dataset URI and identification section (excluding + extent and keywords) are always preserved. + Parent locales are always replaced. +
+ Distribution and maintenance section are always replaced (even + in add mode) because + ISO19115 does not allow to have more than one. +
+ Help on shortcuts ?

Shortcuts in editing mode:

Index: web/geonetwork/loc/fr/xml/strings.xml =================================================================== --- web/geonetwork/loc/fr/xml/strings.xml (revision 5829) +++ web/geonetwork/loc/fr/xml/strings.xml (working copy) @@ -10,6 +10,60 @@ Русский Рortuguês + +
+ Mettre à jour les enfants associés à la métadonnée. Choisir la + stratégie à appliquer pour les principales sections. +
+
+ Ajout conserve les sections de l'enfant et ajoute à la suite + les sections correspondantes du parent. + Remplace supprime les sections de l'enfant et les remplaces + par les sections correspondates issues du parent. +
+
+ L'identifiant de l'enfant, le jeu de caractère, la langue, + l'identifiant du parent, l'URI et la section identification (à + l'exception de l'étendue et des mots clés) sont toujours conservés. + Les langues du parents sont toujours utilisées. +
+ Les sections distribution et maintenance sont toujours + remplacées (même en mode ajout) car l' + ISO19115 n'autorise pas d'avoir plus d'une de ces deux sections. +
+ + + Créer un enfant + Mettre à jour les enfants + Enfants mis à jour + Echec de la mise à jour + Mettre à jour les enfants + Choisir la stratégie de mise à jour : + Ajouter les sections + Remplacer les sections + +
+

Plus d'informations

+ Mettre à jour l'ensemble des enfants pour la métadonnée en cours. Choisir + la stratégie à appliquer pour l'ensemble des sections. +
+
+ Ajouter conservera la section correspondante de l'enfant et ajoutera + celle du parent. + Remplacer supprimera la section correspondante de l'enfant + par celle du parent. +
+
+ L'identifiant de l'enfant, le jeux de caractère, la langue, l'identifiant du + parent, le niveau de hiérarchie, l'URI et la section identification + (à l'exception de l'étendue et des mots clés) sont toujours conservés. +
+ Les sections distribution et maintenance sont toujours remplacées + (y compris en mode ajout) car l'ISO19115 impose la présence d'une seule + de ces sections. +
+ + Aide pour les raccourcis ?

Raccourcis pour l'édition:

Index: web/geonetwork/scripts/editor/metadata-show.js =================================================================== --- web/geonetwork/scripts/editor/metadata-show.js (revision 5897) +++ web/geonetwork/scripts/editor/metadata-show.js (working copy) @@ -128,4 +128,50 @@ } ); } + + function massiveUpdateChildren(service, title, width) { + var url = getGNServiceURL(service); + Modalbox.show(url,{title: title, width: width}); + } + + function updateChildren(div, url, onFailureMsg) { + + var pars = "&id="+$('id').value+"&parentUuid="+$('parentUuid').value+ + "&schema="+$('schema').value+"&childrenIds="+$('childrenIds').value; + + // handle checkbox values + var boxes = $(div).getElementsBySelector('input[type="checkbox"]'); + boxes.each( function(s) { + if (s.checked) { + pars += "&"+s.name+"=true"; + } + }); + + // handle radio value + var radios = $(div).getElementsBySelector('input[type="radio"]'); + radios.each ( function(radio) { + if(radio.checked) { + pars += "&"+radio.name+"="+radio.value; + } + }); + + Ext.Ajax.request ({ + url: Env.locService + "/" + url, + method: 'GET', + params: pars, + success: function(result, request) { + var xmlNode = result.responseXML; + if (xmlNode.childNodes.length != 0 && + xmlNode.childNodes[0].localName == "response"){ + var response = xmlNode.childNodes[0].childNodes[0].nodeValue; + alert(response); + window.Modalbox.hide(); + } else + alert(onFailureMsg); + }, + failure: function (result, request) { + alert(onFailureMsg) + } + }); + } Index: web/geonetwork/xml/schemas/iso19139/update-child-from-parent-info.xsl =================================================================== --- web/geonetwork/xml/schemas/iso19139/update-child-from-parent-info.xsl (revision 0) +++ web/geonetwork/xml/schemas/iso19139/update-child-from-parent-info.xsl (revision 0) @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: web/geonetwork/xml/schemas/iso19139/update-fixed-info.xsl =================================================================== --- web/geonetwork/xml/schemas/iso19139/update-fixed-info.xsl (revision 5829) +++ web/geonetwork/xml/schemas/iso19139/update-fixed-info.xsl (working copy) @@ -1,51 +1,63 @@ - + - + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + + + + - + + + - + ISO 19115:2003/19139 @@ -53,7 +65,7 @@ - + 1.0 @@ -61,7 +73,7 @@ - + @@ -76,17 +88,6 @@ - - - - - - - - @@ -101,9 +102,9 @@ - + - + @@ -120,12 +121,14 @@ - + - + @@ -136,7 +139,9 @@ - + @@ -145,20 +150,23 @@ - + - + - + - - - + + + @@ -172,23 +180,26 @@ - - + + - - + - + + + Index: web/geonetwork/xsl/metadata-children.xsl =================================================================== --- web/geonetwork/xsl/metadata-children.xsl (revision 0) +++ web/geonetwork/xsl/metadata-children.xsl (revision 0) @@ -0,0 +1,137 @@ + + + + + + + + + + + +
+ + + + + + + + +   + + + +
+
+ +
    +
  • + + +
    • +
  • + + +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+
+
+ +
+
+
+ +
+ + + + Index: web/geonetwork/xsl/metadata-duplicate.xsl =================================================================== --- web/geonetwork/xsl/metadata-duplicate.xsl (revision 5829) +++ web/geonetwork/xsl/metadata-duplicate.xsl (working copy) @@ -26,6 +26,8 @@
+ +
Index: web/geonetwork/xsl/metadata-iso19139-utils.xsl =================================================================== --- web/geonetwork/xsl/metadata-iso19139-utils.xsl (revision 5829) +++ web/geonetwork/xsl/metadata-iso19139-utils.xsl (working copy) @@ -212,14 +212,36 @@ - - {/root/gui/strings/linkedParentMetadataHelp} - - - + + + {/root/gui/strings/linkedParentMetadataHelp} + + + + + + + + + + + + + + + {/root/gui/strings/updateChildren} + + + + + + +

Index: web/geonetwork/xsl/metadata-utils.xsl =================================================================== --- web/geonetwork/xsl/metadata-utils.xsl (revision 5829) +++ web/geonetwork/xsl/metadata-utils.xsl (working copy) @@ -186,19 +186,37 @@ - - +   - - - + + + - - -   - - + +