[HepData-svn] r1673 - in trunk/hepdata-xml: . src/main/java/cedar/hepdata/xml src/main/resources

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Nov 13 11:49:22 2013
New Revision: 1673

Log:
bringing up to date with changes

Modified:
   trunk/hepdata-xml/pom.xml
   trunk/hepdata-xml/src/main/java/cedar/hepdata/xml/XMLUtils.java
   trunk/hepdata-xml/src/main/resources/mapping.xml

Modified: trunk/hepdata-xml/pom.xml
==============================================================================
--- trunk/hepdata-xml/pom.xml	Tue Nov 12 17:19:11 2013	(r1672)
+++ trunk/hepdata-xml/pom.xml	Wed Nov 13 11:49:22 2013	(r1673)
@@ -107,7 +107,7 @@
     </repository>
     <repository>
       <id>CEDAR</id>
-      <url>http://www.cedar.ac.uk/maven2</url>
+      <url>http://www.hepforge.org/maven2</url>
     </repository>
   </repositories>
 

Modified: trunk/hepdata-xml/src/main/java/cedar/hepdata/xml/XMLUtils.java
==============================================================================
--- trunk/hepdata-xml/src/main/java/cedar/hepdata/xml/XMLUtils.java	Tue Nov 12 17:19:11 2013	(r1672)
+++ trunk/hepdata-xml/src/main/java/cedar/hepdata/xml/XMLUtils.java	Wed Nov 13 11:49:22 2013	(r1673)
@@ -218,6 +218,16 @@
                 }
             }
 
+            // Test if the Inspire ID is valid (and remove if it isn't)
+            Attribute inspireId = ePaper.getAttribute("inspireId");
+            if (inspireId != null) {
+                try {
+                    inspireId.getLongValue();
+                } catch (DataConversionException dce) {
+                    ePaper.removeAttribute("inspireId");
+                }
+            }
+
             // Test if the Reaction Database ID is valid (and remove if it isn't)
             Attribute redId = ePaper.getAttribute("redId");
             if (redId != null) {

Modified: trunk/hepdata-xml/src/main/resources/mapping.xml
==============================================================================
--- trunk/hepdata-xml/src/main/resources/mapping.xml	Tue Nov 12 17:19:11 2013	(r1672)
+++ trunk/hepdata-xml/src/main/resources/mapping.xml	Wed Nov 13 11:49:22 2013	(r1673)
@@ -29,12 +29,21 @@
     <field name="SpiresId">
       <bind-xml name="spiresId" node="attribute"/>
     </field>
+    <field name="InspireId">
+      <bind-xml name="inspireId" node="attribute"/>
+    </field>
     <field name="RedId">
       <bind-xml name="redId" node="attribute"/>
     </field>
     <field name="Title">
       <bind-xml name="title" node="element"/>
     </field>
+    <field name="DOI">
+      <bind-xml name="doi" node="element"/>
+    </field>
+    <field name="DateUpdated">
+      <bind-xml name="dateupdated" node="element"/>
+    </field>
     <field name="Experiments" type="cedar.hepdata.model.Experiment" collection="sortedset" set-method="addExperiment" get-method="getExperiments">
       <bind-xml name="experiment" node="element"/>
     </field> 
@@ -108,9 +117,15 @@
     <field name="Plus">
       <bind-xml name="plus" node="attribute"/>
     </field>
+    <field name="PlusLength">
+      <bind-xml name="pluslength" node="attribute"/>
+    </field>
     <field name="Minus">
       <bind-xml name="minus" node="attribute"/>
     </field>
+    <field name="MinusLength">
+      <bind-xml name="minuslength" node="attribute"/>
+    </field>
     <field name="SourceType" type="java.lang.String" handler="cedar.hepdata.xml.ErrorSourceHandler">
       <bind-xml name="source" node="attribute"/>
     </field>
@@ -210,12 +225,21 @@
     <field name="LowValue">
       <bind-xml name="low" node="attribute"/>
     </field>
+    <field name="LowValueLength">
+      <bind-xml name="lowlength" node="attribute"/>
+    </field>
     <field name="HighValue">
       <bind-xml name="high" node="attribute"/>
     </field>
+    <field name="HighValueLength">
+      <bind-xml name="highlength" node="attribute"/>
+    </field>
     <field name="Focus">
       <bind-xml name="focus" node="attribute"/>
     </field>
+    <field name="FocusLength">
+      <bind-xml name="focuslength" node="attribute"/>
+    </field>
      <field name="Description">
       <bind-xml name="description" node="attribute"/>
     </field>
@@ -236,6 +260,9 @@
     <field name="Value">
       <bind-xml name="value" node="attribute"/>
     </field>     
+    <field name="ValueLength">
+      <bind-xml name="valuelength" node="attribute"/>
+    </field>     
     <field name="Relation" type="java.lang.String" handler="cedar.hepdata.xml.RelationHandler">
       <bind-xml name="relation" node="attribute"/>
     </field>