[MMBASE SCM] r40965 - in mmbase/trunk/core/src/main/java/org/mmbase: module/tools util/xml/applicationdata

[michiel]

Author: michiel
Date: 2010-02-11 16:50:25 +0100 (Thu, 11 Feb 2010)
New Revision: 40965

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
   
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/applicationdata/RelationNodeReader.java
Log:
  MMB-1932

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
   2010-02-11 15:48:21 UTC (rev 40964)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/module/tools/ApplicationInstaller.java
   2010-02-11 15:50:25 UTC (rev 40965)
@@ -527,8 +527,7 @@
                         if (relationAlreadyExists(insRel, newNode, snumber, 
dnumber)) {
                             log.warn("Application tries to add relation which 
already exists. " +
                                     "Skipping relation with exportnumber " + 
exportnumber);
-                        }
-                        else {
+                        } else {
                             localnumber = newNode.insert("import");
                             if (localnumber != -1) {
                                 createSyncnode(syncbul, exportsource, 
timestamp, exportnumber, localnumber);

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/applicationdata/RelationNodeReader.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/applicationdata/RelationNodeReader.java
 2010-02-11 15:48:21 UTC (rev 40964)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/applicationdata/RelationNodeReader.java
 2010-02-11 15:50:25 UTC (rev 40965)
@@ -65,12 +65,26 @@
                         int num = Integer.parseInt(n4.getNodeValue());
                         newNode.setValue("number", num);
 
-                        n4 = nm.getNamedItem("snumber");
-                        int rnum = Integer.parseInt(n4.getNodeValue());
-                        newNode.setValue("snumber", rnum);
-                        n4 = nm.getNamedItem("dnumber");
-                        int dnum = Integer.parseInt(n4.getNodeValue());
-                        newNode.setValue("dnumber", dnum);
+                        {
+                            n4 = nm.getNamedItem("snumber");
+                            String s = n4.getNodeValue();
+                            if (s.startsWith(":")) {
+                                newNode.setValue("snumber", s);
+                            } else {
+                                int snum = Integer.parseInt(n4.getNodeValue());
+                                newNode.setValue("snumber", snum);
+                            }
+                        }
+                        {
+                            n4 = nm.getNamedItem("dnumber");
+                            String s = n4.getNodeValue();
+                            if (s.startsWith(":")) {
+                                newNode.setValue("dnumber", s);
+                            } else {
+                                int dnum = Integer.parseInt(n4.getNodeValue());
+                                newNode.setValue("dnumber", dnum);
+                            }
+                        }
                         n4 = nm.getNamedItem("rtype");
                         String rname = n4.getNodeValue();
                         RelDef reldef = mmbase.getRelDef();

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs