SF.net SVN: geonetwork:[1415] sandbox/geonetworkui/BlueNetMEST/web/ geonetwork

View: New views
1 Messages — Rating Filter:   Alert me  

SF.net SVN: geonetwork:[1415] sandbox/geonetworkui/BlueNetMEST/web/ geonetwork

by volkermische :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 1415
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1415&view=rev
Author:   volkermische
Date:     2008-07-22 00:49:55 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
Saving to geonetwork works again.
The metadata posted to GeoNetwork is processed by a stylesheet that removes all nodes of geonet namespace

Modified Paths:
--------------
    sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml
    sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl
    sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl

Added Paths:
-----------
    sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-update-cleanup.xsl

Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml
===================================================================
--- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2008-07-21 23:54:57 UTC (rev 1414)
+++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2008-07-22 00:49:55 UTC (rev 1415)
@@ -103,7 +103,7 @@
 
  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
- <service name="metadata.update">
+ <service name="metadata.update" sheet="metadata-update-cleanup.xsl">
  <class name=".services.metadata.Update"/>
 
  <output forward="metadata.edit" />

Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl
===================================================================
--- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl 2008-07-21 23:54:57 UTC (rev 1414)
+++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl 2008-07-22 00:49:55 UTC (rev 1415)
@@ -224,7 +224,7 @@
               <username>admin</username>
               <password>admin</password>
               <id><xsl:value-of select="/root/gmd:MD_Metadata/geonet:info/id"/></id>
-              <version><xsl:value-of select="number(/root/gmd:MD_Metadata/geonet:info/version)"/></version>
+              <version><xsl:value-of select="number(/root/gmd:MD_Metadata/geonet:info/version)+1"/></version>
               <data/>
               <!--
               <foo2><xsl:copy-of select="/root/gmd:MD_Metadata/geonet:info"/></foo2>
@@ -323,11 +323,6 @@
       <xf:delete nodeset="instance('geonetwork-request-update')/data/*"/>
       <xf:insert context="instance('geonetwork-request-update')/data" nodeset="*" origin="instance('metadata')"/>
     </xf:action>
-    
-    <!-- remove all geonet:child elements before submitting -->
-    <xf:action ev:event="DOMActivate" while="count(instance('geonetwork-request-update')/data//geonet:child) > 0">
-      <xf:delete nodeset="instance('geonetwork-request-update')/data//geonet:child"/>
-    </xf:action>
   </xf:submit>
 
   <xf:submit submission="submit-full">

Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl
===================================================================
--- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl 2008-07-21 23:54:57 UTC (rev 1414)
+++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl 2008-07-22 00:49:55 UTC (rev 1415)
@@ -60,11 +60,11 @@
  <a href="/orbeon/gn/{$metadata/geonet:info/uuid}/{/root/gui/env/server/host}:{/root/gui/env/server/port}/{/root/gui/env/server/host}:{/root/gui/env/server/port}">Orbeon App</a>
         -
         -->
- <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fuuid={$metadata/geonet:info/uuid}">Custom</a>
+ <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fediting=y%3fuuid={$metadata/geonet:info/uuid}">Custom</a>
         -
- <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fuuid={$metadata/geonet:info/uuid}%26config=">Full</a>
+ <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fediting=y%3fuuid={$metadata/geonet:info/uuid}%26config=">Full</a>
         -
- <a href="xforms.xml?uuid={$metadata/geonet:info/uuid}">Raw XForms output</a>
+ <a href="xforms.xml?editing=y&uuid={$metadata/geonet:info/uuid}">Raw XForms output</a>
  </div>
  </xsl:for-each>
  </xsl:template>

Added: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-update-cleanup.xsl
===================================================================
--- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-update-cleanup.xsl                        (rev 0)
+++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-update-cleanup.xsl 2008-07-22 00:49:55 UTC (rev 1415)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This stylesheet removes all nodes with geonet namespace -->
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:geonet="http://www.fao.org/geonetwork"
+    version="1.0"
+>
+
+<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
+
+<!-- the folloing 10 lines of code are based on
+     http://bytes.com/forum/post2532983-5.html (2008-07-22) -->
+<xsl:strip-space elements="*"/>
+
+<xsl:template match="node()|@*">
+  <xsl:copy>
+    <xsl:apply-templates select="node()|@*"/>
+  </xsl:copy>
+</xsl:template>
+
+<xsl:template match="geonet:*"/>
+<xsl:template match="*[* and not(descendant::*[not(*) and not(self::geonet:*)])]"/>
+
+
+</xsl:stylesheet>
+


Property changes on: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-update-cleanup.xsl
___________________________________________________________________
Added: svn:mime-type
   + text/xsl
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
GeoNetwork-commit mailing list
GeoNetwork-commit@...
https://lists.sourceforge.net/lists/listinfo/geonetwork-commit
LightInTheBox - Buy quality products at wholesale price