Adding debugging/trace code to isolate KSS vs CSpace wiki differences in service...

diff --git a/sandbox/kss/wiki_to_java/src/main/java/CSpace.java b/sandbox/kss/wiki_to_java/src/main/java/CSpace.java
index bdfd1724b76babca545b6409618dbf3b0ab525e2..8a6852de32dd1c4240d4c32779408a556df4fcb9 100644 (file)
--- a/sandbox/kss/wiki_to_java/src/main/java/CSpace.java
+++ b/sandbox/kss/wiki_to_java/src/main/java/CSpace.java
@@ -1,5 +1,5 @@
 /**\r
- * CSpace.java\r
+ * \r
  */\r
 \r
 import java.io.File;\r
@@ -29,8 +29,8 @@ public class CSpace {
                // the URL to the contract to transform\r
                URL contractURL = null;\r
                try {\r
-//                     contractURL = new URL("https://test.kuali.org/confluence/display/KULSTU/Authentication+Service");\r
-                       contractURL = new URL("http://wiki.collectionspace.org/display/collectionspace/wikitojavatestservice");\r
+                       contractURL = new URL("https://test.kuali.org/confluence/display/KULSTU/Authentication+Service");\r
+//                     contractURL = new URL("http://wiki.collectionspace.org/display/collectionspace/wikitojavatestservice");\r
                        \r
                        //\r
                } catch (MalformedURLException e) {\r
@@ -51,7 +51,7 @@ public class CSpace {
                        new File("C:/dev/src/kss/maven-kscontract-plugin/maven-kscontract-plugin/src/main/resources/messageInterface.xml");\r
                \r
                // the session ID token\r
-               String jsessionId = "53F14F3833498C0A43DA87B273D1DDB7.Kuali3_1Engine";\r
+               String jsessionId = "8B705ECBA5854E818026D31FC4A38C1A.Kuali3_1Engine";\r
                \r
                \r
                \r

diff --git a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/ContractReader.java b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/ContractReader.java
index c64fecc918d559d1a5672c86bcfaae6de63647ed..1c23f0e1af36b121844ce6246d649240452810eb 100644 (file)
--- a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/ContractReader.java
+++ b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/ContractReader.java
@@ -71,7 +71,7 @@ public class ContractReader {
                 }\r
             } else {\r
 //                if (line.contains("</a>Capabilities</h3>")) {\r
-               if (Pattern.matches(".*</a>\\s*Capabilities\\s*</h3>.*", line) == true) {\r
+               if (line.matches(".*</a>\\s*Capabilities\\s*</h3>.*") == true) {\r
                     inContract = false;\r
                 } else {\r
                     builder.append(line);\r

diff --git a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/MessageContractReader.java b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/MessageContractReader.java
index 4565f226eab5383ba3bad05cbc018a45ccb00ba1..ee4fbc9ab9423d2e01591860c2c0be82509a2c62 100644 (file)
--- a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/MessageContractReader.java
+++ b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/contract/MessageContractReader.java
@@ -42,6 +42,7 @@ public class MessageContractReader extends ContractReader {
 \r
                // read each line and fix any open tags, bad attributes, and '&' symbols\r
                // without a ';'\r
+               boolean inContract = false;\r
                while ((line = reader.readLine()) != null) {\r
 \r
                        // Check if the current line has a tag that does not end yet\r
@@ -54,16 +55,52 @@ public class MessageContractReader extends ContractReader {
                                }\r
                        }\r
 \r
+//                     System.err.println("Line before:" + line); // BEFORE\r
+                       \r
                        // Do some regex to clean up the tags\r
                        line = line.replaceAll("border=0", "border=\"0\"");\r
                        line = line.replaceAll("([^:])nowrap([^=])", "$1nowrap=\"true\"$2");\r
                        line = line.replaceAll("&(\\w+[^;])", "$1");\r
                        line = line.replaceAll("(<(META|meta|br|hr|col|link|img|input)(\\s+[\\w-]+\\s*=\\s*(\"([^\"]*)\"|'([^']*)'))*\\s*)>", "$1/>");\r
                        line = line.replaceAll("<div \">", "<div>");\r
-                       builder.append(line + "\n");\r
+                       \r
+//                     System.err.println("Line after :" + line); // AFTER\r
+//                     System.err.println();\r
+                       \r
+                       if (line.contains("Example</h3>")) {\r
+                               inContract = false;\r
+                               builder.append("</div>" + "\n"); // end of <div class=wiki-content>\r
+                               builder.append("</div>" + "\n"); // end of <div id=content>\r
+                               builder.append("</div>" + "\n"); // end of <div id=main>\r
+                               builder.append("</body>" + "\n"); // end of <body>\r
+                               builder.append("</html>" + "\n"); // end of <html>\r
+                       }\r
+\r
+                       if (line.contains("id=\"structureMetaTable\"")) {\r
+                               inContract = true;\r
+                               // Add <html>, <body>, and main <div> nodes\r
+                               builder.append("<html>" + "\n");\r
+                               builder.append("<body>" + "\n");\r
+                               builder.append("<div id=\"main\">" + "\n");\r
+                               \r
+                               // Add <div> for content, and <div> for wiki content\r
+                               builder.append("<div id=\"content\">" + "\n");\r
+                               builder.append("<div class=\"wiki-content\">" + "\n");\r
+                       }\r
+                       \r
+                       if (inContract == true) {\r
+                               builder.append(line + "\n");\r
+//                             System.out.println(line);\r
+                       }\r
+                       \r
+                       \r
                }\r
 \r
+               System.out.println(builder.toString());\r
+\r
                return builder.toString();\r
+               \r
+               \r
        }\r
-\r
 }\r
+       \r

diff --git a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/mojo/KsContractMojo.java b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/mojo/KsContractMojo.java
index afbde3120afc20b6432b29c8fc4992cada947b45..b5b6d6960bb50a80f106559803dacf28df72da14 100644 (file)
--- a/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/mojo/KsContractMojo.java
+++ b/sandbox/kss/wiki_to_java/src/main/java/org/kuali/student/mojo/KsContractMojo.java
@@ -150,6 +150,12 @@ public class KsContractMojo extends AbstractMojo {
                                || "integer".equals(param.toLowerCase())) {\r
                        return;\r
                }\r
+               \r
+               //rem\r
+               if (param.equals("objectStructure")) {\r
+                       System.out.println();\r
+               }\r
+               \r
                ContractReader contract;\r
                try {\r
                        contract = new MessageContractReader(url, jsessionId);\r
@@ -161,12 +167,25 @@ public class KsContractMojo extends AbstractMojo {
                        // add this url to the already oarsed list\r
                        alreadyParsedUrlSet.add(url);\r
 \r
+//                     System.out.println("URL:" + url.toString());\r
+//                     System.out.println(contract.getContractText());\r
+                       \r
                        // recurse through the node to\r
                        NodeList nodeList = contract.getDocument().getElementsByTagName(\r
                                        "td");\r
                        for (int i = 0, iCnt = nodeList.getLength(); i < iCnt; i++) {\r
                                Node node = nodeList.item(i);\r
                                NamedNodeMap nodeMap = node.getAttributes();\r
+                               System.err.println("Node=" + i + ":" + node.toString());\r
+                               \r
+                               //rem\r
+                               if (nodeMap != null) {\r
+                                       if (nodeMap.getNamedItem("class") != null) {\r
+                                               String nodeValue = nodeMap.getNamedItem("class").getNodeValue();\r
+                                               System.out.println("Node value: " + i + ":" + nodeValue);\r
+                                       }\r
+                               }\r
+                               \r
                                if (nodeMap != null\r
                                                && nodeMap.getNamedItem("class") != null\r
                                                && "structType".equals(nodeMap.getNamedItem("class")\r
@@ -193,6 +212,7 @@ public class KsContractMojo extends AbstractMojo {
                                        "Error loading page for Type '" + param + "'"\r
                                                        + e.getMessage());\r
                } catch (ParserConfigurationException e) {\r
+                       e.printStackTrace();\r
                        getLog().warn(\r
                                        "Error parsing page for Type '" + param + "'"\r
                                                        + e.getMessage());\r
@@ -200,6 +220,8 @@ public class KsContractMojo extends AbstractMojo {
                        getLog().warn(\r
                                        "Error parsing page for Type '" + param + "'"\r
                                                        + e.getMessage());\r
+               } finally {\r
+                       System.err.println();\r
                }\r
        }\r
 \r
@@ -220,8 +242,8 @@ public class KsContractMojo extends AbstractMojo {
                                        try {\r
                                                String urlString = node.getFirstChild().getAttributes()\r
                                                                .getNamedItem("href").getNodeValue();\r
-                                               System.out.println("urlString:" + urlString);\r
-                                               System.out.println("contractURL:" + contractURL);\r
+//                                             System.out.println("urlString:" + urlString);\r
+//                                             System.out.println("contractURL:" + contractURL);\r
                                                if (!urlString.startsWith("http")\r
                                                                && !urlString.startsWith("file")) {\r
                                                        urlString = contractURL.getProtocol()+"://"+contractURL.getHost()\r
@@ -258,7 +280,11 @@ public class KsContractMojo extends AbstractMojo {
                        Result result = new StreamResult(new File(outputDirectory, param\r
                                        .substring(0, 1).toUpperCase()\r
                                        + param.substring(1) + ".java"));\r
-                       transformer.transform(contract.getStreamSource(), result);\r
+                       \r
+                       StreamSource xmlSource = contract.getStreamSource();\r
+                       transformer.transform(xmlSource, result);\r
+                       \r
+                       System.out.println(result.toString());\r
                } catch (TransformerConfigurationException e) {\r
                        // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
@@ -268,6 +294,8 @@ public class KsContractMojo extends AbstractMojo {
                } catch (TransformerException e) {\r
                        // TODO Auto-generated catch block\r
                        e.printStackTrace();\r
+               } finally {\r
+                       System.out.println();\r
                }\r
 \r
        }\r