Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[7453] sandbox/BlueNetMEST/ANZMEST/web/src/main
|
From: <sp...@us...> - 2011-03-10 14:37:19
|
Revision: 7453
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7453&view=rev
Author: sppigot
Date: 2011-03-10 14:37:12 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Add support for incompatible records, processing of JZKitConfig.xml.tem (needs
refactoring)
Modified Paths:
--------------
sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/constants/Geonet.java
sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950Config.java
sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigHarvester.java
sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigParams.java
sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/services/util/z3950/Repositories.java
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ar/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ca/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/cn/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/de/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/en/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/es/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/fr/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/nl/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/pt/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ru/xml/harvesting.xml
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/harvesting/z3950Config/client-result-tip.xsl
sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/xml/harvesting/z3950Config.xsl
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/constants/Geonet.java
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/constants/Geonet.java 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/constants/Geonet.java 2011-03-10 14:37:12 UTC (rev 7453)
@@ -135,6 +135,7 @@
public static final String IMPORT_STYLESHEETS = CONV_STYLESHEETS + "/import";
public static final String WFS_STYLESHEETS = "/convert/WFSToFragments";
public static final String TDS_STYLESHEETS = "/convert/ThreddsToFragments";
+ public static final String ISO19119TOJZKIT_STYLESHEET = "/convert/19119ToJZKitRepository.xsl";
public static final String CONVERT_STYLESHEETS = "/convert/";
public static final String DIF_STYLESHEET = "/convert/DIFToISO.xsl";
public static final String LOGOS = "/images/logos/";
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950Config.java
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950Config.java 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950Config.java 2011-03-10 14:37:12 UTC (rev 7453)
@@ -25,10 +25,12 @@
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
import jeeves.utils.BinaryFile;
+import jeeves.utils.Xml;
import jeeves.utils.XmlRequest;
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.DataManager;
+import org.fao.geonet.kernel.SchemaManager;
import org.fao.geonet.kernel.harvest.harvester.CategoryMapper;
import org.fao.geonet.kernel.harvest.harvester.GroupMapper;
import org.fao.geonet.kernel.harvest.harvester.RecordInfo;
@@ -38,6 +40,7 @@
import org.fao.geonet.kernel.mef.MEFVisitor;
import org.fao.geonet.kernel.setting.SettingManager;
import org.fao.geonet.lib.Lib;
+import org.fao.geonet.services.util.z3950.Repositories;
import org.fao.geonet.util.ISODate;
import org.jdom.Element;
@@ -71,6 +74,7 @@
GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME);
dataMan = gc.getDataManager();
+ schemaMan = gc.getSchemamanager();
result = new Z3950ConfigResult();
}
@@ -93,12 +97,8 @@
for(RecordInfo ri : records) {
result.totalMetadata++;
- String id = dataMan.getMetadataId(dbms, ri.uuid);
-
- // look up:
- // server url and port (srv:xxxx)
- // description gmd:title/gco:CharacterString
- addServerToZ3950Config(id);
+ // get metadata from remote geonetwork machine (assume local for now)
+ addServerToZ3950Config(ri.uuid, dbms);
}
log.info("End of Z3950 Config Harvest for : "+ params.name);
@@ -116,14 +116,34 @@
//--- Clear Z3950 Config from JZKitConfig.xml.tem
//--------------------------------------------------------------------------
- private void clearZ3950Config() {}
+ private void clearZ3950Config() {
+ Repositories.clearTemplate(context.getAppPath(), context);
+ }
//--------------------------------------------------------------------------
//--- Add new config to JZKitConfig.xml.tem
//--------------------------------------------------------------------------
- private void addServerToZ3950Config(String id) {}
+ private void addServerToZ3950Config(String uuid, Dbms dbms) throws Exception {
+ String id = dataMan.getMetadataId(dbms, uuid);
+ String schema = dataMan.getMetadataSchema(dbms, id);
+ String convert19119ToJZKitRepo = schemaMan.getSchemaDir(schema) + Geonet.Path.ISO19119TOJZKIT_STYLESHEET;
+
+ if (new File(convert19119ToJZKitRepo).exists()) {
+ Element md = dataMan.getMetadataNoInfo(context, id);
+ Element repoElem = Xml.transform(md, convert19119ToJZKitRepo);
+ if (repoElem.getName().equals("Repository")) {
+ Repositories.addRepo(context.getAppPath(), context, uuid, repoElem);
+ result.addedMetadata++;
+ } else {
+ result.incompatibleMetadata++;
+ }
+ } else {
+ result.incompatibleMetadata++;
+ }
+ }
+
//--------------------------------------------------------------------------
//---
//--- Variables
@@ -136,6 +156,7 @@
private XmlRequest request;
private Z3950ConfigParams params;
private DataManager dataMan;
+ private SchemaManager schemaMan;
private Z3950ConfigResult result;
}
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigHarvester.java
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigHarvester.java 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigHarvester.java 2011-03-10 14:37:12 UTC (rev 7453)
@@ -183,6 +183,7 @@
add(res, "total", result.totalMetadata);
add(res, "added", result.addedMetadata);
+ add(res, "incompatible", result.incompatibleMetadata);
add(res, "unretrievable", result.unretrievable);
info.addContent(res);
@@ -219,6 +220,7 @@
public int totalMetadata;
public int addedMetadata;
public int unretrievable;
+ public int incompatibleMetadata;
}
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigParams.java
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigParams.java 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/z3950Config/Z3950ConfigParams.java 2011-03-10 14:37:12 UTC (rev 7453)
@@ -55,9 +55,9 @@
{
super.create(node);
- Element site = node.getChild("site");
+ Element options = node.getChild("options");
Element searches = node.getChild("searches");
- clearConfig = Util.getParam(site, "clearConfig", true);
+ clearConfig = Util.getParam(options, "clearConfig", true);
addSearches(searches);
}
@@ -71,9 +71,9 @@
{
super.update(node);
- Element site = node.getChild("site");
+ Element options = node.getChild("options");
Element searches = node.getChild("searches");
- clearConfig = Util.getParam(site, "clearConfig", clearConfig);
+ clearConfig = Util.getParam(options, "clearConfig", clearConfig);
//--- if some search queries are given, we drop the previous ones and
//--- set these new ones
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/services/util/z3950/Repositories.java
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/services/util/z3950/Repositories.java 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/java/org/fao/geonet/services/util/z3950/Repositories.java 2011-03-10 14:37:12 UTC (rev 7453)
@@ -26,11 +26,16 @@
import jeeves.constants.Jeeves;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Xml;
+import org.fao.geonet.util.FileCopyMgr;
import org.jdom.Comment;
+import org.jdom.Content;
import org.jdom.Document;
import org.jdom.Element;
+import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
//=============================================================================
@@ -66,6 +71,98 @@
}
//--------------------------------------------------------------------------
+
+ /** clear the repositories template file - read the file and remove all
+ * <Repository> entries except the GNSearchable one
+ */
+ public static boolean clearTemplate(String appPath, ServiceContext context)
+ {
+ String tempRepo = appPath + Jeeves.Path.WEBINF + "classes/JZKitConfig.xml" + ".tem";
+ String backRepo = tempRepo + ".backup";
+
+ boolean copied = false;
+ boolean restore = false;
+
+ try {
+ FileCopyMgr.copyFiles(new File(tempRepo), new File(backRepo));
+ Element root = Xml.loadFile(tempRepo);
+ Element copy = new Element(root.getName());
+ List<Element> children = root.getChildren();
+ for (Element child : children) {
+ if (child.getName().equals("Repository") && child.getAttributeValue("className").equals("org.jzkit.search.provider.z3950.Z3950Origin")) continue;
+ copy.addContent((Content)child.clone());
+ }
+
+ FileOutputStream os = new FileOutputStream(tempRepo);
+ Xml.writeResponse(new Document(copy), os);
+ os.close();
+ } catch (Exception e) {
+ context.warning("Cannot clear Z39.50 repositories template : "+ e.getMessage());
+ e.printStackTrace();
+ // restore the backup copy
+ if (copied) {
+ try {
+ FileCopyMgr.copyFiles(new File(backRepo), new File(tempRepo));
+ } catch (IOException ioe) {
+ context.error("Cannot restore Z39.50 repositories template : this is serious and should not happen"+ ioe.getMessage());
+ ioe.printStackTrace();
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+
+ //--------------------------------------------------------------------------
+
+ /** Add a <Repository> element to the template file or replace one that
+ * is already present
+ */
+ public static boolean addRepo(String appPath, ServiceContext context, String code, Element repo)
+ {
+ String tempRepo = appPath + Jeeves.Path.WEBINF + "classes/JZKitConfig.xml" + ".tem";
+ String backRepo = tempRepo + ".backup";
+
+ boolean copied = false;
+ boolean restore = false;
+ boolean replaced = false;
+
+ try {
+ FileCopyMgr.copyFiles(new File(tempRepo), new File(backRepo));
+ Element root = Xml.loadFile(tempRepo);
+ Element copy = new Element(root.getName());
+ List<Element> children = root.getChildren();
+ for (Element child : children) {
+ if (child.getName().equals("Repository") && child.getAttributeValue("code").equals(code)) {
+ copy.addContent(repo);
+ replaced = true;
+ } else {
+ copy.addContent((Content)child.clone());
+ }
+ }
+ if (!replaced) copy.addContent(repo); // just add it
+
+ FileOutputStream os = new FileOutputStream(tempRepo);
+ Xml.writeResponse(new Document(copy), os);
+ os.close();
+ } catch (Exception e) {
+ context.warning("Cannot add Z39.50 repository " + Xml.getString(repo) + " : "+ e.getMessage());
+ e.printStackTrace();
+ // restore the backup copy
+ if (copied) {
+ try {
+ FileCopyMgr.copyFiles(new File(backRepo), new File(tempRepo));
+ } catch (IOException ioe) {
+ context.error("Cannot restore Z39.50 repositories template : this is serious and should not happen"+ ioe.getMessage());
+ ioe.printStackTrace();
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+
+ //--------------------------------------------------------------------------
//---
//--- Private methods
//---
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql 2011-03-10 14:37:12 UTC (rev 7453)
@@ -110,6 +110,7 @@
INSERT INTO CategoriesDes VALUES (8,'en','Audio/Video');
INSERT INTO CategoriesDes VALUES (9,'en','Directories');
INSERT INTO CategoriesDes VALUES (10,'en','Other information resources');
+INSERT INTO CategoriesDes VALUES (11,'en','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (2,'es','Conjuntos de datos');
INSERT INTO CategoriesDes VALUES (3,'es','Recursos interactivos');
INSERT INTO CategoriesDes VALUES (5,'es','Casos de Uso, buenas prácticas');
@@ -119,6 +120,7 @@
INSERT INTO CategoriesDes VALUES (9,'es','Directorios');
INSERT INTO CategoriesDes VALUES (8,'es','Audio/Vídeo');
INSERT INTO CategoriesDes VALUES (10,'es','Otros recursos de información');
+INSERT INTO CategoriesDes VALUES (11,'es','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (1,'ru','Карты и графика');
INSERT INTO CategoriesDes VALUES (2,'ru','Наборы данных');
INSERT INTO CategoriesDes VALUES (3,'ru','Интерактивные ресурсы');
@@ -129,6 +131,7 @@
INSERT INTO CategoriesDes VALUES (8,'ru','Аудио/Видео');
INSERT INTO CategoriesDes VALUES (9,'ru','Каталоги/справочники');
INSERT INTO CategoriesDes VALUES (10,'ru','Другие ресурсы');
+INSERT INTO CategoriesDes VALUES (11,'ru','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (1,'cn','Maps & graphics');
INSERT INTO CategoriesDes VALUES (2,'cn','Datasets');
INSERT INTO CategoriesDes VALUES (3,'cn','Interactive resources');
@@ -139,10 +142,12 @@
INSERT INTO CategoriesDes VALUES (8,'cn','Audio/Video');
INSERT INTO CategoriesDes VALUES (9,'cn','Directories');
INSERT INTO CategoriesDes VALUES (10,'cn','Other information resources');
+INSERT INTO CategoriesDes VALUES (11,'cn','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (2,'fr','Jeux de données');
INSERT INTO CategoriesDes VALUES (1,'fr','Cartes & graphiques');
INSERT INTO CategoriesDes VALUES (7,'fr','Photographies');
INSERT INTO CategoriesDes VALUES (10,'fr','Autres ressources');
+INSERT INTO CategoriesDes VALUES (11,'fr','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (5,'fr','Etude de cas, meilleures pratiques');
INSERT INTO CategoriesDes VALUES (1,'es','Mapas & gráficos');
INSERT INTO CategoriesDes VALUES (8,'fr','Vidéo/Audio');
@@ -160,6 +165,7 @@
INSERT INTO CategoriesDes VALUES (8,'de','Audio/Video');
INSERT INTO CategoriesDes VALUES (9,'de','Verzeichnisse');
INSERT INTO CategoriesDes VALUES (10,'de','Andere Resourcen');
+INSERT INTO CategoriesDes VALUES (11,'de','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (1,'nl','Kaarten & afbeeldingen');
INSERT INTO CategoriesDes VALUES (2,'nl','Datasets');
INSERT INTO CategoriesDes VALUES (3,'nl','Interactieve kaarten');
@@ -170,6 +176,7 @@
INSERT INTO CategoriesDes VALUES (8,'nl','Audio/Video');
INSERT INTO CategoriesDes VALUES (9,'nl','Catalogi');
INSERT INTO CategoriesDes VALUES (10,'nl','Andere informatie bronnen');
+INSERT INTO CategoriesDes VALUES (11,'nl','Z3950 Servers');
INSERT INTO CategoriesDes VALUES (1,'pt','Mapas & Graficos');
INSERT INTO CategoriesDes VALUES (2,'pt','Datasets');
INSERT INTO CategoriesDes VALUES (3,'pt','Fontes Interactivas');
@@ -180,6 +187,7 @@
INSERT INTO CategoriesDes VALUES (8,'pt','Audio/Video');
INSERT INTO CategoriesDes VALUES (9,'pt','Directorios');
INSERT INTO CategoriesDes VALUES (10,'pt','Outra Informação sobre Fontes');
+INSERT INTO CategoriesDes VALUES (11,'pt','Z3950 Servers');
-- ======================================================================
-- === Table: Groups
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ar/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ar/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ar/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -308,6 +308,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Waiting for the first run</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ca/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ca/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ca/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -304,6 +304,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Esperant la primera execució</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/cn/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/cn/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/cn/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -308,6 +308,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Waiting for the first run</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/de/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/de/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/de/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -306,6 +306,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Warten auf das erste Update</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/en/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/en/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/en/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -309,6 +309,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Waiting for the first run</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/es/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/es/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/es/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -306,6 +306,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Esperando por la primera ejecución</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/fr/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/fr/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/fr/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -306,6 +306,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>En attente du premier lancement</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/nl/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/nl/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/nl/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -306,6 +306,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Wachten op de eerste uitvoer</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/pt/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/pt/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/pt/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -306,6 +306,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>À espera da primeira execução</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ru/xml/harvesting.xml
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ru/xml/harvesting.xml 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/loc/ru/xml/harvesting.xml 2011-03-10 14:37:12 UTC (rev 7453)
@@ -310,6 +310,7 @@
<fragmentsReturned>Fragments Returned</fragmentsReturned>
<fragmentsMatched>Fragments Matched</fragmentsMatched>
<recordsBuilt>Records Built</recordsBuilt>
+ <incompatible>Incompatible</incompatible>
</tipHeader>
<notRun>Ожидает первого запуска</notRun>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/harvesting/z3950Config/client-result-tip.xsl
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/harvesting/z3950Config/client-result-tip.xsl 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/harvesting/z3950Config/client-result-tip.xsl 2011-03-10 14:37:12 UTC (rev 7453)
@@ -40,6 +40,11 @@
<td class="tipHeader"><xsl:value-of select="/root/strings/tipHeader/unretrievable"/></td>
<td class="tipCell"><xsl:value-of select="unretrievable"/></td>
</tr>
+
+ <tr class="tipRow">
+ <td class="tipHeader"><xsl:value-of select="/root/strings/tipHeader/incompatible"/></td>
+ <td class="tipCell"><xsl:value-of select="incompatible"/></td>
+ </tr>
</table>
</xsl:template>
Modified: sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/xml/harvesting/z3950Config.xsl
===================================================================
--- sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/xml/harvesting/z3950Config.xsl 2011-03-10 14:26:17 UTC (rev 7452)
+++ sandbox/BlueNetMEST/ANZMEST/web/src/main/webapp/xsl/xml/harvesting/z3950Config.xsl 2011-03-10 14:37:12 UTC (rev 7453)
@@ -11,7 +11,7 @@
<!-- ============================================================================================= -->
<xsl:template match="*" mode="options">
- <clearConfig><xsl:value-of select="clearConfig" /></clearConfig>
+ <clearConfig><xsl:value-of select="clearConfig/value"/></clearConfig>
</xsl:template>
<!-- ============================================================================================= -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|