Index: src/org/fao/gast/lib/MefLib.java =================================================================== --- src/org/fao/gast/lib/MefLib.java (revision 1677) +++ src/org/fao/gast/lib/MefLib.java (working copy) @@ -30,6 +30,8 @@ import java.util.List; import java.util.UUID; import jeeves.resources.dbms.Dbms; + +import org.fao.geonet.kernel.mef.MEFFileVisitor; import org.fao.geonet.kernel.mef.MEFLib; import org.fao.geonet.kernel.mef.MEFVisitor; import org.fao.geonet.util.ISODate; @@ -53,7 +55,7 @@ Lib.log.info("Adding MEF file : "+ mefFile.getAbsolutePath()); - MEFLib.visit(mefFile, new MEFVisitor() + MEFLib.visit(mefFile, new MEFFileVisitor(), new MEFVisitor() { public void handleMetadata(Element mdata) throws Exception { Index: src/org/fao/geonet/constants/Params.java =================================================================== --- src/org/fao/geonet/constants/Params.java (revision 1677) +++ src/org/fao/geonet/constants/Params.java (working copy) @@ -73,6 +73,10 @@ public static final String COUNTRY = "country"; public static final String KIND = "kind"; public static final String RATING = "rating"; + public static final String FILE_TYPE = "file_type"; + public static final String GENERATE_UUID= "generateUUID"; + public static final String UUID_ACTION = "uuidAction"; + public static final String NOTHING = "nothing"; public static final String SCALING = "scaling"; public static final String SCALING_DIR = "scalingDir"; Index: src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java =================================================================== --- src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java (revision 1677) +++ src/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java (working copy) @@ -44,6 +44,7 @@ import org.fao.geonet.kernel.harvest.harvester.GroupMapper; import org.fao.geonet.kernel.harvest.harvester.RecordInfo; import org.fao.geonet.kernel.harvest.harvester.UUIDMapper; +import org.fao.geonet.kernel.mef.MEFFileVisitor; import org.fao.geonet.kernel.mef.MEFLib; import org.fao.geonet.kernel.mef.MEFVisitor; import org.fao.geonet.lib.Lib; @@ -179,7 +180,7 @@ try { - MEFLib.visit(mefFile, new MEFVisitor() + MEFLib.visit(mefFile, new MEFFileVisitor(), new MEFVisitor() { public void handleMetadata(Element mdata) throws Exception { @@ -432,7 +433,7 @@ try { - MEFLib.visit(mefFile, new MEFVisitor() + MEFLib.visit(mefFile, new MEFFileVisitor(), new MEFVisitor() { public void handleMetadata(Element mdata) throws Exception { Index: src/org/fao/geonet/kernel/mef/FileVisitor.java =================================================================== --- src/org/fao/geonet/kernel/mef/FileVisitor.java (revision 0) +++ src/org/fao/geonet/kernel/mef/FileVisitor.java (revision 0) @@ -0,0 +1,99 @@ +//============================================================================= +//=== 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.kernel.mef; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import org.jdom.Element; + + +//============================================================================= + +public interface FileVisitor +{ + // -------------------------------------------------------------------------- + // --- + // --- API methods + // --- + // -------------------------------------------------------------------------- + + public void visit(File mefFile, MEFVisitor v) throws Exception; + + // -------------------------------------------------------------------------- + + public Element handleXml(File mefFile, MEFVisitor v) throws Exception ; + + // -------------------------------------------------------------------------- + + public void handleBin(File mefFile, MEFVisitor v, Element info) throws Exception ; + + // -------------------------------------------------------------------------- + +} + +// ============================================================================= + +class InputStreamBridge extends InputStream +{ + // -------------------------------------------------------------------------- + // --- + // --- Constructor + // --- + // -------------------------------------------------------------------------- + + public InputStreamBridge(InputStream is) + { + this.is = is; + } + + // -------------------------------------------------------------------------- + // --- + // --- Bridging methods + // --- + // -------------------------------------------------------------------------- + + public int read() throws IOException { return is.read(); } + + public int available() throws IOException { return is.available(); } + + // --- this *must* be empty to work with zip files + public void close() throws IOException {} + + public synchronized void mark(int readlimit) { is.mark(readlimit); } + + public synchronized void reset() throws IOException { is.reset(); } + + public boolean markSupported() { return is.markSupported(); } + + // -------------------------------------------------------------------------- + // --- + // --- Variables + // --- + // -------------------------------------------------------------------------- + + private InputStream is; +} +// ============================================================================= + Index: src/org/fao/geonet/kernel/mef/Importer.java =================================================================== --- src/org/fao/geonet/kernel/mef/Importer.java (revision 1677) +++ src/org/fao/geonet/kernel/mef/Importer.java (working copy) @@ -35,13 +35,16 @@ import jeeves.server.context.ServiceContext; import jeeves.utils.BinaryFile; import jeeves.utils.Log; +import jeeves.utils.Util; import jeeves.utils.Xml; import org.fao.geonet.GeonetContext; import org.fao.geonet.constants.Geonet; +import org.fao.geonet.constants.Params; import org.fao.geonet.kernel.DataManager; import org.fao.geonet.lib.Lib; import org.fao.geonet.util.ISODate; +import org.fao.oaipmh.exceptions.BadArgumentException; import org.jdom.Element; //============================================================================= @@ -54,7 +57,10 @@ //--- //-------------------------------------------------------------------------- - public static int doImport(final ServiceContext context, File mefFile) throws Exception + private static final String SingleFileType = "single"; + private static final String MefFileType = "mef"; + + public static int doImport(final Element params, final ServiceContext context, File mefFile, final String stylePath) throws Exception { final GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); final DataManager dm = gc.getDataManager(); @@ -63,10 +69,21 @@ final String id[] = { "" }; final Element md[] = { null }; + + String fileType = Util.getParam(params,Params.FILE_TYPE, MefFileType); + + FileVisitor visitor = null; + + if (fileType.equals(SingleFileType)) + visitor = new XMLFileVisitor(); + else if (fileType.equals(MefFileType)) + visitor = new MEFFileVisitor(); + else + throw new BadArgumentException("Missing file type parameter!!"); //--- import metadata from MEF file - MEFLib.visit(mefFile, new MEFVisitor() + MEFLib.visit(mefFile, visitor, new MEFVisitor() { public void handleMetadata(Element metadata) throws Exception { @@ -78,27 +95,85 @@ public void handleInfo(Element info) throws Exception { - Element general = info.getChild("general"); + String uuid = null; + String createDate = null; + String changeDate = null; + String source = null; + String sourceName = null; + String schema = null; + String isTemplate = null; + String rating = null; + String popularity = null; + String groupId = null; + Element categs = null; + Element privileges = null; + // Element group = null; + + boolean dcore = false; + boolean fgdc = false; + boolean iso115 = false; + boolean iso139 = false; + + // Handle non MEF files insertion + if (info.getChildren().size() == 0) { + + schema = Util.getParam(params, Params.SCHEMA); + source = Util.getParam(params, Params.SITE_ID, gc + .getSiteId()); + isTemplate = Util.getParam(params, Params.TEMPLATE, "n"); - String uuid = general.getChildText("uuid"); - String createDate = general.getChildText("createDate"); - String changeDate = general.getChildText("changeDate"); - String source = general.getChildText("siteId"); - String sourceName = general.getChildText("siteName"); - String schema = general.getChildText("schema"); - String isTemplate = general.getChildText("isTemplate").equals("true") ? "y" : "n"; - String rating = general.getChildText("rating"); - String popularity = general.getChildText("popularity"); + categs = new Element("categories"); + categs.addContent((new Element("category")).setAttribute( + "name", Util.getParam(params, Params.CATEGORY))); + + groupId = Util.getParam(params, Params.GROUP); + privileges = new Element("group"); + privileges.addContent(new Element("operation").setAttribute("name", "view")); + privileges.addContent(new Element("operation").setAttribute("name", "download")); + privileges.addContent(new Element("operation").setAttribute("name", "notify")); + privileges.addContent(new Element("operation").setAttribute("name", "dynamic")); + privileges.addContent(new Element("operation").setAttribute("name", "featured")); + + String style = Util.getParam(params, Params.STYLESHEET); + + // Apply a stylesheet transformation if requested + if (!style.equals("_none_")) + md[0] = Xml.transform(md[0],stylePath+"/"+style); + + // Get the Metadata uuid + if (isTemplate.equals("n")) + uuid = dm.extractUUID(schema, md[0]); + + } else { - boolean dcore = schema.equals("dublin-core"); - boolean fgdc = schema.equals("fgdc-std"); - boolean iso115 = schema.equals("iso19115"); - boolean iso139 = schema.equals("iso19139"); + categs = info.getChild("categories"); + privileges = info.getChild("privileges"); + Element general = info.getChild("general"); + + uuid = general.getChildText("uuid"); + createDate = general.getChildText("createDate"); + changeDate = general.getChildText("changeDate"); + source = general.getChildText("siteId"); + sourceName = general.getChildText("siteName"); + schema = general.getChildText("schema"); + isTemplate = general.getChildText("isTemplate").equals("true") ? "y" : "n"; + rating = general.getChildText("rating"); + popularity = general.getChildText("popularity"); + + } + + dcore = schema.equals("dublin-core"); + fgdc = schema.equals("fgdc-std"); + iso115 = schema.equals("iso19115"); + iso139 = schema.equals("iso19139"); + if (!dcore && !fgdc && !iso115 && !iso139) throw new Exception("Unknown schema format : "+schema); - if (uuid == null) + String uuidAction = Util.getParam(params, Params.UUID_ACTION); + + if (uuid == null || uuid.equals("") || uuidAction.equals(Params.GENERATE_UUID)) { uuid = UUID.randomUUID().toString(); source = null; @@ -117,7 +192,17 @@ Lib.sources.update(dbms, source, sourceName, true); } - Log.debug(Geonet.MEF, "Adding metadata with uuid="+ uuid); + try { + if (dm.existsMetadataUuid(dbms, uuid) && !uuidAction.equals(Params.NOTHING)) { + dm.deleteMetadata(dbms, dm.getMetadataId(dbms, uuid)) ; + context.debug("Deleting existing metadata with UUID : " + uuid ); + } + } + catch (Exception e) { + throw new Exception(" Existing metadata with same UUID could not be deleted."); + } + + context.debug("Adding metadata with uuid="+ uuid); id[0] = dm.insertMetadataExt(dbms, schema, md[0], context.getSerialFactory(), source, createDate, changeDate, uuid, @@ -140,8 +225,13 @@ new File(pubDir).mkdirs(); new File(priDir).mkdirs(); - addCategories(dm, dbms, id[0], info.getChild("categories")); - addPrivileges(dm, dbms, id[0], info.getChild("privileges")); + addCategories(dm, dbms, id[0], categs); + + if (groupId == null) + addPrivileges(dm, dbms, id[0], privileges); + else + addOperations(dm, dbms, privileges, id[0], groupId); + dm.indexMetadata(dbms, id[0]); } @@ -274,7 +364,7 @@ { Element entity = (Element) e; - if (entity.getChildText("name").equals(name)) + if (entity.getChildText("name").equals(name) || entity.getChildText("id").equals(name)) return entity.getChildText("id"); } Index: src/org/fao/geonet/kernel/mef/MEFFileVisitor.java =================================================================== --- src/org/fao/geonet/kernel/mef/MEFFileVisitor.java (revision 0) +++ src/org/fao/geonet/kernel/mef/MEFFileVisitor.java (revision 0) @@ -0,0 +1,169 @@ +//============================================================================= +//=== 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.kernel.mef; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import jeeves.exceptions.BadFormatEx; +import jeeves.utils.Xml; +import org.jdom.Element; + +import static org.fao.geonet.kernel.mef.MEFConstants.*; + +//============================================================================= + +public class MEFFileVisitor implements FileVisitor +{ + //-------------------------------------------------------------------------- + //--- + //--- API methods + //--- + //-------------------------------------------------------------------------- + + public void visit(File mefFile, MEFVisitor v) throws Exception + { + Element info = handleXml(mefFile, v); + handleBin(mefFile, v, info); + } + + //-------------------------------------------------------------------------- + + public Element handleXml(File mefFile, MEFVisitor v) throws Exception + { + ZipInputStream zis = new ZipInputStream(new FileInputStream(mefFile)); + InputStreamBridge isb = new InputStreamBridge(zis); + + ZipEntry entry; + + Element md = null; + Element info = null; + + try + { + while ((entry=zis.getNextEntry()) != null) + { + String name = entry.getName(); + + if (name.equals(FILE_METADATA)) + md = Xml.loadStream(isb); + + else if (name.equals(FILE_INFO)) + info = Xml.loadStream(isb); + + zis.closeEntry(); + } + } + finally + { + safeClose(zis); + } + + if (md == null) + throw new BadFormatEx("Missing metadata file : "+ FILE_METADATA); + + if (info == null) + throw new BadFormatEx("Missing info file : "+ FILE_INFO); + + v.handleMetadata(md); + v.handleInfo(info); + + return info; + } + + //-------------------------------------------------------------------------- + + public void handleBin(File mefFile, MEFVisitor v, Element info) throws Exception + { + ZipInputStream zis = new ZipInputStream(new FileInputStream(mefFile)); + InputStreamBridge isb = new InputStreamBridge(zis); + + List pubFiles = info.getChild("public") .getChildren(); + List prvFiles = info.getChild("private").getChildren(); + + ZipEntry entry; + + try + { + while ((entry=zis.getNextEntry()) != null) + { + String fullName = entry.getName(); + String simpleName = new File(fullName).getName(); + + if (fullName.equals(DIR_PUBLIC) || fullName.equals(DIR_PRIVATE)) + continue; + + if (fullName.startsWith(DIR_PUBLIC)) + v.handlePublicFile(simpleName, getChangeDate(pubFiles, simpleName), isb); + + else if (fullName.startsWith(DIR_PRIVATE)) + v.handlePrivateFile(simpleName, getChangeDate(prvFiles, simpleName), isb); + + zis.closeEntry(); + } + } + finally + { + safeClose(zis); + } + } + + //-------------------------------------------------------------------------- + + private static String getChangeDate(List files, String fileName) throws Exception + { + for (Object f : files) + { + Element file = (Element) f; + String name = file.getAttributeValue("name"); + String date = file.getAttributeValue("changeDate"); + + if (name.equals(fileName)) + return date; + } + + throw new Exception("File not found in info.xml : "+ fileName); + } + + //-------------------------------------------------------------------------- + + private static void safeClose(ZipInputStream zis) + { + try + { + zis.close(); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + +} + +//============================================================================= + Index: src/org/fao/geonet/kernel/mef/MEFLib.java =================================================================== --- src/org/fao/geonet/kernel/mef/MEFLib.java (revision 1677) +++ src/org/fao/geonet/kernel/mef/MEFLib.java (working copy) @@ -25,6 +25,8 @@ import java.io.File; +import org.jdom.Element; + import jeeves.exceptions.BadInputEx; import jeeves.exceptions.BadParameterEx; import jeeves.exceptions.MissingParameterEx; @@ -40,9 +42,9 @@ //--- //-------------------------------------------------------------------------- - public static int doImport(ServiceContext context, File mefFile) throws Exception + public static int doImport(Element params, ServiceContext context, File mefFile, String stylePath) throws Exception { - return Importer.doImport(context, mefFile); + return Importer.doImport(params, context, mefFile, stylePath); } //-------------------------------------------------------------------------- @@ -55,9 +57,9 @@ //-------------------------------------------------------------------------- - public static void visit(File mefFile, MEFVisitor v) throws Exception + public static void visit(File mefFile, FileVisitor fvisitor, MEFVisitor v) throws Exception { - Visitor.visit(mefFile, v); + fvisitor.visit(mefFile, v); } //-------------------------------------------------------------------------- Index: src/org/fao/geonet/kernel/mef/Visitor.java =================================================================== --- src/org/fao/geonet/kernel/mef/Visitor.java (revision 1677) +++ src/org/fao/geonet/kernel/mef/Visitor.java (working copy) @@ -1,212 +0,0 @@ -//============================================================================= -//=== 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.kernel.mef; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; -import jeeves.exceptions.BadFormatEx; -import jeeves.utils.Xml; -import org.jdom.Element; - -import static org.fao.geonet.kernel.mef.MEFConstants.*; - -//============================================================================= - -public class Visitor -{ - //-------------------------------------------------------------------------- - //--- - //--- API methods - //--- - //-------------------------------------------------------------------------- - - public static void visit(File mefFile, MEFVisitor v) throws Exception - { - Element info = handleXml(mefFile, v); - handleBin(mefFile, v, info); - } - - //-------------------------------------------------------------------------- - - private static Element handleXml(File mefFile, MEFVisitor v) throws Exception - { - ZipInputStream zis = new ZipInputStream(new FileInputStream(mefFile)); - InputStreamBridge isb = new InputStreamBridge(zis); - - ZipEntry entry; - - Element md = null; - Element info = null; - - try - { - while ((entry=zis.getNextEntry()) != null) - { - String name = entry.getName(); - - if (name.equals(FILE_METADATA)) - md = Xml.loadStream(isb); - - else if (name.equals(FILE_INFO)) - info = Xml.loadStream(isb); - - zis.closeEntry(); - } - } - finally - { - safeClose(zis); - } - - if (md == null) - throw new BadFormatEx("Missing metadata file : "+ FILE_METADATA); - - if (info == null) - throw new BadFormatEx("Missing info file : "+ FILE_INFO); - - v.handleMetadata(md); - v.handleInfo(info); - - return info; - } - - //-------------------------------------------------------------------------- - - private static void handleBin(File mefFile, MEFVisitor v, Element info) throws Exception - { - ZipInputStream zis = new ZipInputStream(new FileInputStream(mefFile)); - InputStreamBridge isb = new InputStreamBridge(zis); - - List pubFiles = info.getChild("public") .getChildren(); - List prvFiles = info.getChild("private").getChildren(); - - ZipEntry entry; - - try - { - while ((entry=zis.getNextEntry()) != null) - { - String fullName = entry.getName(); - String simpleName = new File(fullName).getName(); - - if (fullName.equals(DIR_PUBLIC) || fullName.equals(DIR_PRIVATE)) - continue; - - if (fullName.startsWith(DIR_PUBLIC)) - v.handlePublicFile(simpleName, getChangeDate(pubFiles, simpleName), isb); - - else if (fullName.startsWith(DIR_PRIVATE)) - v.handlePrivateFile(simpleName, getChangeDate(prvFiles, simpleName), isb); - - zis.closeEntry(); - } - } - finally - { - safeClose(zis); - } - } - - //-------------------------------------------------------------------------- - - private static String getChangeDate(List files, String fileName) throws Exception - { - for (Object f : files) - { - Element file = (Element) f; - String name = file.getAttributeValue("name"); - String date = file.getAttributeValue("changeDate"); - - if (name.equals(fileName)) - return date; - } - - throw new Exception("File not found in info.xml : "+ fileName); - } - - //-------------------------------------------------------------------------- - - private static void safeClose(ZipInputStream zis) - { - try - { - zis.close(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } -} - -//============================================================================= - -class InputStreamBridge extends InputStream -{ - //-------------------------------------------------------------------------- - //--- - //--- Constructor - //--- - //-------------------------------------------------------------------------- - - public InputStreamBridge(InputStream is) - { - this.is = is; - } - - //-------------------------------------------------------------------------- - //--- - //--- Bridging methods - //--- - //-------------------------------------------------------------------------- - - public int read() throws IOException { return is.read(); } - - public int available() throws IOException { return is.available(); } - - //--- this *must* be empty to work with zip files - public void close() throws IOException {} - - public synchronized void mark(int readlimit) { is.mark(readlimit); } - - public synchronized void reset() throws IOException { is.reset(); } - - public boolean markSupported() { return is.markSupported(); } - - //-------------------------------------------------------------------------- - //--- - //--- Variables - //--- - //-------------------------------------------------------------------------- - - private InputStream is; -} - -//============================================================================= - Index: src/org/fao/geonet/kernel/mef/XMLFileVisitor.java =================================================================== --- src/org/fao/geonet/kernel/mef/XMLFileVisitor.java (revision 0) +++ src/org/fao/geonet/kernel/mef/XMLFileVisitor.java (revision 0) @@ -0,0 +1,43 @@ +package org.fao.geonet.kernel.mef; + +import java.io.File; + +import jeeves.exceptions.BadFormatEx; +import jeeves.utils.Xml; + +import org.jdom.Element; + +public class XMLFileVisitor implements FileVisitor { + + // -------------------------------------------------------------------------- + // --- + // --- API methods + // --- + // -------------------------------------------------------------------------- + + public void visit(File mefFile, MEFVisitor v) throws Exception { + Element info = handleXml(mefFile, v); + } + + // -------------------------------------------------------------------------- + + public Element handleXml(File mefFile, MEFVisitor v) + throws Exception { + + Element md = null; + Element info = null; + + md = Xml.loadFile(mefFile); + info = new Element("info"); + + if (md == null) + throw new BadFormatEx("Missing xml metadata file ."); + + v.handleMetadata(md); + v.handleInfo(info); + + return info; + } + + public void handleBin(File mefFile, MEFVisitor v, Element info) throws Exception {} +} Index: src/org/fao/geonet/services/mef/Import.java =================================================================== --- src/org/fao/geonet/services/mef/Import.java (revision 1677) +++ src/org/fao/geonet/services/mef/Import.java (working copy) @@ -28,6 +28,8 @@ import jeeves.server.ServiceConfig; import jeeves.server.context.ServiceContext; import jeeves.utils.Util; + +import org.fao.geonet.constants.Geonet; import org.fao.geonet.kernel.mef.MEFLib; import org.jdom.Element; @@ -35,7 +37,11 @@ public class Import implements Service { - public void init(String appPath, ServiceConfig params) throws Exception {} + private String stylePath; + + public void init(String appPath, ServiceConfig params) throws Exception { + this.stylePath = appPath + Geonet.Path.IMPORT_STYLESHEETS; + } //-------------------------------------------------------------------------- //--- @@ -49,7 +55,7 @@ String uploadDir = context.getUploadDir(); File file = new File(uploadDir, mefFile); - int id = MEFLib.doImport(context, file); + int id = MEFLib.doImport(params, context, file, stylePath); file.delete(); Index: web/geonetwork/loc/ar/xml/strings.xml =================================================================== --- web/geonetwork/loc/ar/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/ar/xml/strings.xml (working copy) @@ -118,6 +118,7 @@ تعليقات الرجاء ادخال بياناتك قبل التحميل ملف + File type: الاسم الأول Number of terms found: Français @@ -130,6 +131,7 @@ Precise عام معلومات عامة + Generate UUID for inserted metadata فتح GeoRSS مجموعة إدارة مجموعة @@ -175,6 +177,9 @@ معلومات إدخال + File Upload + Insert mode: + Copy/Paste خريطة تفاعلية

معلومات على الخريطة التفاعلية

You can find interactive maps by searching in GeoNetwork @@ -277,6 +282,7 @@ Open Map Viewer الحد الأعلى تحرير الخطأ + MEF file اسم الدخول وكلمة المرور غير صحيحتين
اضغط على زر رجوع وحاول مرة أخرى عفواً نتج خطأ أثناء عملية تحرير البيانات الأساسية البيانات الاساسية تم تعديلها بواسطة مستخدم آخر، الرجاء اعادة المحاولة @@ -297,6 +303,7 @@ إضافة تصنيف جديد أضافة بيانات اساسية جديدة منسوخة من قالب بيانات اساسية Metadata جديدة + New metadata inserted : كلمة سر جديدة اضافة مستخدم جديد لقاعدة البيانات Next @@ -308,6 +315,7 @@ عفواً، لا توجد معلومات متوفرة لم تتمكن من الدخول الاحداثيات الشمالية + No action on import خريطة تفاعلية روابط حية @@ -318,6 +326,7 @@ Output Full Text only + Overwrite metadata with same UUID ورقية تغطية جزئية احداثيات جزئية @@ -410,6 +419,7 @@ خيارات أقل العرض الافتراضي المحرر الافتراضي + Single File (XML, SLD, WMC...) رقم الموقع المميز الموقع Sort @@ -492,6 +502,7 @@ اسم الدخول تغيير كلمة المرور امنح المستخدم الحالة امكانية تغير كلمة المرور + Import actions: تفيير التقييم يبدأ وينتهي Index: web/geonetwork/loc/cn/xml/strings.xml =================================================================== --- web/geonetwork/loc/cn/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/cn/xml/strings.xml (working copy) @@ -216,12 +216,14 @@ 反馈/建议 下在前请提供您的详细信息 文件 + File type: 名 Français 关键词 输入起始日期 : 常规 常规信息 + Generate UUID for inserted metadata 打开GeoRSS馈入 用户组 用户组管理 @@ -258,6 +260,9 @@ 导入 信息 插入 + File Upload + Insert mode: + Copy/Paste 在线地图

交互地图中的信息

可以在GeoNetwork中搜索带有交互地图的空间数据，也可直接连接到事先定义好的地图服务器，实现交互地图的访问。

支持的地图服务器包括与 Open GeoSpatial® Consortium 规范一致的WMS服务器和 ESRI® ArcIMS服务器。 @@ -337,6 +342,7 @@ Open Map Viewer 最大值 更新错误 + MEF file 用户名或口令有误。
点击“回退”按钮重试。 很遗憾，元数据更新时出现错误。 元数据已被其他用户修改，请重试。 @@ -356,6 +362,7 @@ 新增类型 根据模板向系统新增元数据 新建元数据 + New metadata inserted : 新口令 新增用户 Next @@ -364,10 +371,12 @@ 对不起，没有信息 您还未登录 覆盖范围北边坐标 + No action on import 在线交互地图 在线链接 操作 组织/部门 + Overwrite metadata with same UUID 硬拷贝 部分重叠 局部坐标 @@ -442,6 +451,7 @@ 简单搜索 默认试图 默认编辑器 + Single File (XML, SLD, WMC...) 站点ID 网站 覆盖范围南边坐标 @@ -479,6 +489,7 @@ 用户名 修改口令 允许该用户修改口令 + Import actions: 有效性检查 有效期自 有效期至 Index: web/geonetwork/loc/de/xml/strings.xml =================================================================== --- web/geonetwork/loc/de/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/de/xml/strings.xml (working copy) @@ -184,6 +184,7 @@ Feedback / Kommentare Bitte geben Sie Ihre Kontaktdaten vor dem Download ein Datei + File type: Vorname Français Deutsch @@ -191,6 +192,7 @@ Von Generell Generelle Information + Generate UUID for inserted metadata Öffnen eines GeoRSS feed Gruppe Gruppen Management @@ -230,6 +232,9 @@ Import Info Einfügen + File Upload + Insert mode: + Copy/Paste Interaktive Karte einfacher Viewer erweiterter Viewer @@ -302,6 +307,7 @@ Kartenviewer öffnen Maximum Updatefehler + MEF file Benutzername oder Passwort ist falsch.
Drücken Sie den 'zurück' Button und versuchen Sie es erneut. Sorry, an error occurred while updating metadata. The metadata has been changed by another user. Please retry. @@ -321,6 +327,7 @@ Neue Kategorie Hinzufügen Neue Metadaten hinzufügen Neue Metadaten + New metadata inserted : Neues Passwort Benutzer hinzufügen Next @@ -329,11 +336,13 @@ Entschuldigung, keine Informationen verfügbar Sie sind nicht angemeldet nördliche Grenzkoordinate + No action on import Interaktive Karte Online Linkage GeoNetwork opensearch service allow search to be made into the metadata catalog. Operation Organisation / Abteilung + Overwrite metadata with same UUID Analog teilweise Überschneidung Partial coordinates @@ -423,6 +432,7 @@ einfache Suche Default Ansicht Default Editor + Single File (XML, SLD, WMC...) Seiten ID Seite südliche Grenzkoordinate @@ -461,6 +471,7 @@ Benutzername Passwort ändern Benutzerpasswort für Metadatenkatalog ändern + Import actions: Validieren Gültigkeit ab und endet Index: web/geonetwork/loc/en/xml/strings.xml =================================================================== --- web/geonetwork/loc/en/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/en/xml/strings.xml (working copy) @@ -191,12 +191,14 @@ Feedback / comments Please provide your details before downloading File + File type: First Name Français Free Keywords From General General information + Generate UUID for inserted metadata Open a GeoRSS feed Group Group management @@ -236,6 +238,9 @@ Import Info Insert + File Upload + Insert mode: + Copy/Paste Interactive Map

Info in interactive maps

You can find interactive maps by searching in GeoNetwork for digital data with an interactive map, or directly connet to a pre-configured map server.

Supported map servers are Open GeoSpatial® Consortium compliant WMS Map Servers and ESRI® ArcIMS. @@ -320,6 +325,7 @@ Open Map Viewer Maximum Update error + MEF file The username or the password is wrong.
Press the 'back' button and try again. Sorry, an error occurred while updating metadata. The metadata has been changed by another user. Please retry. @@ -339,6 +345,7 @@ Add a new category Adds a new metadata into geonetwork copying it from a template New metadata + New metadata inserted : New Password Add a new user Next @@ -347,11 +354,13 @@ Sorry, no info available You are not logged in North Bounding Coordinate + No action on import Interactive map Online Linkage GeoNetwork opensearch service allow search to be made into the metadata catalog. Operation Organisation / department + Overwrite metadata with same UUID Hard copy Partially overlapping Partial coordinates @@ -441,6 +450,7 @@ Simple search Default view Default editor + Single File (XML, SLD, WMC...) Site ID Site South Bounding Coordinate @@ -479,6 +489,7 @@ Username Change password Allow current user to change password + Import actions: Validate Validity begins and ends Index: web/geonetwork/loc/es/xml/strings.xml =================================================================== --- web/geonetwork/loc/es/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/es/xml/strings.xml (working copy) @@ -212,12 +212,14 @@ Avisos / comentarios --> Por favor, proporcione sus datos antes de descargar los datos Fichero + File type: Nombre Français Palabras libres De General Información general + Generate UUID for inserted metadata Abrir alimentación GeoRSS Grupo de usuarios @@ -253,6 +255,9 @@ Importar Información Insertar + File Upload + Insert mode: + Copy/Paste Mapa interactivo

Información sobre servidores de mapas

@@ -340,6 +345,7 @@ Abrir el visualizador de mapas Máximo Actualizar error + MEF file El nombre de usuario o la contaseña son incorrectos.
Presione el botón 'atrás' e intentelo de nuevo. El metadato ha sido modificado por otro usuario. Intentelo de nuevo por favor. Gracias por su interés. Pulse sobre el botón de descarga para recoger los datos @@ -359,6 +365,7 @@ Añade un grupo Añade un nuevo metadato Nuevo Metadato + New metadata inserted : Nueva contraseña Añade un nuevo usuario a la Base de datos Next @@ -367,10 +374,12 @@ No está identificado como usuario nada Coordenada Norte + No action on import Mapa Interactivo Recurso en línea Opciones + Overwrite metadata with same UUID Copia impresa Parcialmente contenido Coordenadas parciales @@ -458,6 +467,7 @@ Búsqueda Simple Vista predefinida Vista del editor de Metadatos predefinida + Single File (XML, SLD, WMC...) Lugar Id del lugar Coordenada Sur @@ -495,6 +505,7 @@ Usuario Cambio de contraseña Permite a los usuarios cambiar la contraseña + Import actions: Validar Comienzo y fin válidos Index: web/geonetwork/loc/fr/xml/strings.xml =================================================================== --- web/geonetwork/loc/fr/xml/strings.xml (revision 1677) +++ web/geonetwork/loc/fr/xml/strings.xml (working copy) @@ -209,12 +209,14 @@ Retour / commentaires Merci de préciser vos coordonnées avant le téléchargement des données Fichier + Type de fichier: Prénom Français Mot-clés libres Début Général Information générale + Générer un nouvel identifiant pour les métadonnées insérées Ouvrez flux GeoRSS Groupe Gestion des groupes @@ -250,6 +252,9 @@ Importer Info Insérer + Import de fichiers + Mode d'insertion: + Copier/Coller Carte interactive

Information et cartes interactives

@@ -350,6 +355,7 @@ Afficher la carte Maximum Erreur de mise à jour + Fichier MEF Le nom ou mot de passe est incorrect.
Appuyer sur le bouton 'retour'. Désolé, une erreur s'est produite lors de la mise à jour des métadonnées. La fiche de métadonnées a été modifié par un autre utilisateur. Essayez à nouveau. @@ -369,6 +375,7 @@ Ajouter une catégorie Ajouter une fiche de métadonnées Nouvelle métadonnée + Nouvelle métadonnée inserée : Nouveau mot de passe Ajouter un utilisateur Next @@ -377,11 +384,13 @@ Désolé, pas d'information disponible Vous n'étes pas connecté. Coordonnée nord de l'emprise + Aucune action à l'import Carte interactive Liens Opération Options + Ecraser les métadonnées de même identifiant Copie papier Recouvert partiellement Coordonnées partielles @@ -470,6 +479,7 @@ Recherche simple Vue par défaut Editeur par défaut + Fichier simple (XML, SLD, WMC...) Identifiant Site Coordonnée sud de l'emprise @@ -507,6 +517,7 @@ Nom d'utilisateur Modifier le mot de passe Autoriser l'utilisateur en cours de changer le mot de passe + Actions à l'import: Valider Date de début de validité et fin Index: web/geonetwork/xsl/error.xsl =================================================================== --- web/geonetwork/xsl/error.xsl (revision 1677) +++ web/geonetwork/xsl/error.xsl (working copy) @@ -11,7 +11,7 @@

:

-

+

Index: web/geonetwork/xsl/metadata-insert-form.xsl =================================================================== --- web/geonetwork/xsl/metadata-insert-form.xsl (revision 1677) +++ web/geonetwork/xsl/metadata-insert-form.xsl (working copy) @@ -10,7 +10,13 @@