Menu
▾
▴
[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/schemedit/test EditorViewRenderTester.java, 1.5, 1.6, JloTester.java, 1.6, 1.7, SimpleSchemaHelperTester.java, 1.13, 1.14, SequenceTester.java, 1.4, 1.5, FrameworkConfigTester.java, 1.8, 1.9, XpathTester.java, 1.3, 1.4, MultiFrameworkTally.java, 1.1, 1.2, TransformTester.java, 1.2, 1.3, FrameworkTester.java, 1.8, 1.9, RenderTester.java, 1.11, 1.12, SchemaHelperTester.java, 1.12, 1.13,
|
From: Jonathan O. <os...@us...> - 2009-07-07 03:29:41
|
Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4216/src/org/dlese/dpc/schemedit/test Modified Files: EditorViewRenderTester.java JloTester.java SimpleSchemaHelperTester.java SequenceTester.java FrameworkConfigTester.java XpathTester.java MultiFrameworkTally.java TransformTester.java FrameworkTester.java RenderTester.java SchemaHelperTester.java Log Message: updated testers Index: MultiFrameworkTally.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/MultiFrameworkTally.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultiFrameworkTally.java 24 Apr 2009 22:39:30 -0000 1.1 --- MultiFrameworkTally.java 7 Jul 2009 03:29:38 -0000 1.2 *************** *** 93,96 **** --- 93,105 ---- } + void showDerivedTextOnlyModelNodes() { + for (Iterator i = this.getXmlFormats().iterator(); i.hasNext(); ) { + String xmlFormat = (String) i.next(); + SchemaHelper sh = this.getSchemaHelper(xmlFormat); + prtln("\n *** " + xmlFormat + "***"); + SchemaUtils.showDerivedTextOnlyModelNodes(sh); + } + } + void showChoices() { for (Iterator i = this.getXmlFormats().iterator(); i.hasNext(); ) { *************** *** 117,132 **** */ ! /* formats.add("adn"); formats.add("ncs_item"); formats.add("concepts"); ! formats.add("mast"); ! formats.add("dlese_anno"); */ ! formats.add ("mets"); ! formats.add ("choice_tester"); MultiFrameworkTally tally = new MultiFrameworkTally(formats); // tally.showDerivedContentModelNodes(); ! // tally.showChoices(); ! tally.showModelGroups(); } --- 126,143 ---- */ ! formats.add("adn"); formats.add("ncs_item"); formats.add("concepts"); ! formats.add("mast_demo"); ! formats.add("dlese_anno"); ! formats.add("msp2"); ! /* formats.add ("mets"); ! formats.add ("choice_tester");*/ MultiFrameworkTally tally = new MultiFrameworkTally(formats); // tally.showDerivedContentModelNodes(); ! tally.showChoices(); ! // tally.showModelGroups(); ! // tally.showDerivedTextOnlyModelNodes(); } Index: FrameworkTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/FrameworkTester.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrameworkTester.java 20 Mar 2009 23:33:58 -0000 1.8 --- FrameworkTester.java 7 Jul 2009 03:29:38 -0000 1.9 *************** *** 24,29 **** --- 24,31 ---- import org.dlese.dpc.schemedit.*; import org.dlese.dpc.schemedit.config.*; + import org.dlese.dpc.schemedit.input.EnsureMinimalDocument; import org.dlese.dpc.xml.*; import org.dlese.dpc.xml.schema.*; + import org.dlese.dpc.xml.schema.compositor.Compositor; import org.dlese.dpc.util.*; import org.dlese.dpc.webapps.tools.GeneralServletTools; *************** *** 43,47 **** * *@author ostwald - <p>$Id$ */ public class FrameworkTester { --- 45,48 ---- *************** *** 267,271 **** prtln("FrameworkTester\n"); ! String format = "sif_activity"; // dcs_data news_opps adn framework_config if (args.length > 0) --- 268,272 ---- prtln("FrameworkTester\n"); ! String format = "library_dc"; // dcs_data news_opps adn framework_config if (args.length > 0) *************** *** 274,281 **** FrameworkTester tester = new FrameworkTester(format); MetaDataFramework framework = tester.getFramework(); ! tester.showSchemaPaths(); // tester.copyRecordTester(); ! framework.makeMinimalRecord("fooberry"); } --- 275,303 ---- FrameworkTester tester = new FrameworkTester(format); MetaDataFramework framework = tester.getFramework(); ! // tester.showSchemaPaths(); ! ! UserInfo userInfo = framework.getUserInfo(); ! if (userInfo != null) { ! // prtln (userInfo.toString()); ! } ! else ! prtln ("User Info is NULL"); ! // tester.copyRecordTester(); ! // Document doc = framework.makeMinimalRecord("fooberry"); ! ! // String itemPath = "/Users/ostwald/devel/dcs-records/2009_06_10-records/smile_item9/1246053008647/S9-000-000-000-005.xml"; ! String itemPath = "/Users/ostwald/devel/dcs-records/2009_06_10-records/library_dc/1246122420417/LFOO-000-000-000-001.xml"; ! Document doc = Dom4jUtils.getXmlDocument(new File (itemPath)); ! doc = Dom4jUtils.localizeXml(doc); ! doc = framework.preprocessEditableDocument(doc); ! /* EnsureMinimalDocument ensurer = new EnsureMinimalDocument (doc, tester.framework.getSchemaHelper()); ! ensurer.process (doc, framework.getSchemaHelper()); */ ! EnsureMinimalDocument.process (doc, framework.getSchemaHelper()); ! // pp (doc); ! prtln ("----------------"); ! prtln ("InstanceDoc **\n" +Dom4jUtils.prettyPrint(doc)); ! prtln ("----------------"); } *************** *** 295,301 **** throw new Exception("populateFields caught error: " + t.getMessage()); } ! pp (copyDoc); } void showSchemaPaths () { --- 317,401 ---- throw new Exception("populateFields caught error: " + t.getMessage()); } ! // pp (copyDoc); } + /* Document ensureRequiredPaths (Document instanceDoc) { + Element root = instanceDoc.getRootElement(); + ensureRequiredPaths (root); + return instanceDoc; + } */ + + void addRequiredPaths (Element e) { + String path = e.getPath(); + SchemaNode schemaNode = this.framework.getSchemaHelper().getSchemaNode (path); + prtln (schemaNode.toString()); + } + + /* private void ensureRequiredPaths(Element e) { + // prtln ("SchemaHelper.pruneTree(" + e.getPath() + ")"); + + SchemaNode schemaNode = getSchemaNode(e.getPath()); + + // Ignore ABSTRACT ELEMENTS + if (schemaNode == null) { + String msg = "WARNING: ensureRequiredPaths could not find schemaNode for" + e.getPath(); + prtln(msg); + return; + } + + GlobalDef typeDef = schemaNode.getTypeDef(); + + Compositor compositor = schemaNode.getCompositor(); + + if (compositor != null) { + List leafMemberNames = compositor.getLeafMemberNames(); + List children + + List attributes = e.attributes(); + for (int i = attributes.size() - 1; i > -1; i--) { + Attribute attr = (Attribute) attributes.get(i); + // String path = attr.getPath(); + String path = e.getPath() + "/@" + attr.getQualifiedName(); + SchemaNode attrNode = getSchemaNode(path); + if (attrNode == null) { + // prtln("pruneTree: schemaNode not found for attribute " + path); + continue; + } + + if (!attrNode.isRequired()) { + // prtln("pruneTree: removing attribute " + attr.getName() + " from " + path); + e.remove(attr); + } + } + + List children = e.elements(); + for (int i = children.size() - 1; i > -1; i--) { + Element child = (Element) children.get(i); + String path = child.getPath(); + SchemaNode childSchemaNode = getSchemaNode(path); + if (childSchemaNode == null) { + prtln("pruneTree: schemaNode not found for element at " + path); + continue; + } + + if (!childSchemaNode.isRequired()) { + // prtln("removing " + childSchemaNode.getXpath()); + if (!e.remove(child)) { + prtln("pruneTree: failed to remove element " + child.getName() + " from " + path); + } + continue; + } + if (isChoiceElement(childSchemaNode) || this.isAnyTypeElement(path)) { + // prtln("removing choice element at " + path); + if (!e.remove(child)) { + prtln("pruneTree: failed to remove " + child.getName() + " from " + path); + } + continue; + } + else { + pruneTree(child); + } + } + } */ void showSchemaPaths () { Index: EditorViewRenderTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/EditorViewRenderTester.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EditorViewRenderTester.java 20 Mar 2009 23:33:58 -0000 1.5 --- EditorViewRenderTester.java 7 Jul 2009 03:29:38 -0000 1.6 *************** *** 31,38 **** /** - * Class for testing dom manipulation with help from {@link org.dlese.dpc.xml.schema.SchemaHelper} * ! *@author ostwald<p> ! $Id $ */ public class EditorViewRenderTester extends RenderTester { --- 31,36 ---- /** * ! *@author ostwald */ public class EditorViewRenderTester extends RenderTester { *************** *** 48,58 **** public static void main (String [] args) throws Exception { ! String xmlFormat = "dlese_anno"; if (args.length > 0) xmlFormat = args[0]; String renderPath = null; ! // renderPath = "/record/general/recordID"; ! renderPath = "/annotationRecord/moreInfo"; if (args.length > 1) renderPath = args[1]; --- 46,56 ---- public static void main (String [] args) throws Exception { ! String xmlFormat = "mast_demo"; if (args.length > 0) xmlFormat = args[0]; String renderPath = null; ! renderPath = "/record/general"; ! // renderPath = "/annotationRecord/moreInfo"; if (args.length > 1) renderPath = args[1]; Index: JloTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/JloTester.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JloTester.java 20 Mar 2009 23:33:58 -0000 1.6 --- JloTester.java 7 Jul 2009 03:29:38 -0000 1.7 *************** *** 31,34 **** --- 31,35 ---- import org.dom4j.io.*; import org.jaxen.SimpleNamespaceContext; + import java.util.regex.*; import org.dlese.dpc.util.strings.FindAndReplace; *************** *** 68,202 **** } ! void visit () { ! for (Iterator i=doc.getRootElement().elementIterator();i.hasNext();) { ! Element child = (Element)i.next(); ! String path = child.getPath(); ! prtln (NL + path); ! prtln (T + Dom4jUtils.prettyPrint(child)); ! prtln (T + "isEmpty: " + docMap.isEmpty(path)); ! prtln (T + "hasChildren: " + docMap.hasChildren(path)); ! prtln (T + "hasContent: " + child.hasContent()); ! prtln (T + "hasMixedContent: " + child.hasMixedContent()); ! prtln ("---"); ! } ! } ! ! static void clearContentTest () throws Exception { ! String xml = "<a foo=\'blue\'>text<child/></a>"; ! Document doc = DocumentHelper.parseText(xml); ! Element root = doc.getRootElement(); ! prtln ("before"); ! pp (root); ! root.clearContent(); ! prtln ("after"); ! pp (root); ! } ! ! static void paramNameTest1 () { ! String oldParamName = "anyTypeValueOf(/annotationRecord/moreInfo/xsd:any_3_)"; ! String oldXPath = "/annotationRecord/moreInfo/xsd:any[3]"; ! String siblingPath = XPathUtils.getSiblingXPath(oldXPath); ! prtln ("oldParamName: " + oldParamName); ! prtln ("oldXPath: " + oldXPath); ! prtln ("siblingPath: " + siblingPath); ! int index = 3; ! int x = oldParamName.indexOf(siblingPath); ! String newParamName = null; ! if (x > -1) { ! newParamName = oldParamName.substring(0, x + siblingPath.length()); ! prtln ("newParamName0: " + newParamName); ! newParamName = newParamName + "_" + index + "_)"; ! prtln ("newParamName: " + newParamName); ! } ! else { ! prtln ("what??"); ! } ! } ! ! static String getNewParamName (String oldParamName, int index) throws Exception { ! String xpath = InputManager.stripFunctionCall(oldParamName); ! String siblingPath = XPathUtils.getSiblingXPath(xpath); ! prtln ("\noldParamName: " + oldParamName); ! prtln ("xpath: " + xpath); ! prtln ("siblingPath: " + siblingPath); ! Pattern pat = Pattern.compile(".*?" + siblingPath + "_([0-9]*?)_\\)"); ! Matcher m = pat.matcher(oldParamName); ! if (m.matches()) { ! return oldParamName.substring(0, m.start(1)) + index + "_)"; ! } ! else ! throw new Exception ("getNewParamName did not match pattern"); ! } ! ! static void paramNameTest () { ! String oldParamName = "anyTypeValueOf(/this:mets/this:fileSec/this:fileGrp_1_/this:file_1_/this:FContent/this:xmlData/xsd:any_2_)"; ! // String oldParamName = "anyTypeValueOf(/annotationRecord/moreInfo/xsd:any_3_)"; ! int index = 32; ! String newParamName = null; try { ! newParamName = getNewParamName (oldParamName, index); } catch (Exception e) { ! prtln ("ERROR: " + e.getMessage()); ! return; ! } ! prtln ("newParamName: " + newParamName); ! String newXPath = InputManager.paramNameToXPath(newParamName); ! prtln ("newXPath: " + newXPath); ! } ! ! static void paramNameTest2 () { ! String oldParamName = "anyTypeValueOf(/annotationRecord/moreInfo/xsd:any_3_)"; ! String oldXPath = "/annotationRecord/moreInfo/xsd:any[3]"; ! String siblingPath = XPathUtils.getSiblingXPath(oldXPath); ! prtln ("oldParamName: " + oldParamName); ! prtln ("oldXPath: " + oldXPath); ! prtln ("siblingPath: " + siblingPath); ! int index = 3; ! ! Pattern pat = Pattern.compile(".*?" + siblingPath + "_([0-9]*?)_\\)"); ! Matcher m = pat.matcher(oldParamName); ! if (m.matches()) { ! prtln ("match!: " + m.group(1)); ! prtln ("rest: " + oldParamName.substring(m.start(1))); ! prtln ("New: " + oldParamName.substring(0, m.start(1)) + index + "_)"); ! } ! else ! prtln ("NO match"); ! } ! ! static void docParseErrorTest () throws Exception { ! String xmlPath = "C:/tmp/parseErrorTest.xml"; ! String xml = Files.readFile(xmlPath).toString(); ! Document doc = null; ! try { ! doc = DocumentHelper.parseText(xml); ! prtln ("Parse is successfull"); ! } catch (DocumentException e) { ! prtln ("PARSEERROR: " + formatParseException(e.getMessage())); } } - static String formatParseException (String s) { - prtln ("original error: " + s); - String pat = "Nested exception"; - int x = s.toLowerCase().indexOf(pat.toLowerCase()); - if (x != -1) { - String f = s.substring(0, x).trim(); - prtln ("f: \"" + f + "\""); - return f; - } - return s; - } - static void isAttributePath (String s) { - prtln ("\ninput: " + s); - prtln ("leaf: " + XPathUtils.getLeaf(s)); - prtln ("nodename: " + XPathUtils.getNodeName(s)); - prtln ("siboling: " + XPathUtils.getSiblingXPath(s)); - if (XPathUtils.isAttributePath(s)) - prtln ("ATTRIBUTE"); - else - prtln ("ELEMENT"); - } /** --- 69,84 ---- } ! JloTester(URL url) throws Exception { try { ! doc = Dom4jUtils.getXmlDocument (url); ! docMap = new DocMap (doc); } catch (Exception e) { ! throw new Exception ("init error: " + e.getMessage()); ! } catch (Throwable t) { ! throw new Exception ("unknown error!"); } } /** *************** *** 207,227 **** */ public static void main(String[] args) throws Exception { ! /* ! String path = "C:/tmp/jloTester.xml"; ! JloTester t = new JloTester (path); ! ! t.visit(); ! */ ! // clearContentTest(); ! // paramNameTest(); ! // docParseErrorTest(); ! String path = "/er/asdf/noasdn_1_"; ! isAttributePath(path); } /** --- 89,127 ---- */ public static void main(String[] args) throws Exception { ! ! /* String path = "/editor/editorHTMLIncludes.jsp"; ! Element e = DocumentHelper.createElement ("foo"); ! e.setText ("<%@ include file=\"" + path + "\" %>"); ! pp (e); ! String s = Dom4jUtils.prettyPrint(e); ! String out = replaceDirectives(s); ! prtln ("out: " + out); */ + int total = 99; + int done = 43; + float percentComplete = (float)done/total; + prtln ("percentComplete: " + Float.toString(percentComplete)); } + static String replaceDirectives (String s) { + // pattern to detect page directives (e.g., includes) that were inserted + // into Document as text and therefore have the tags escaped. + Pattern p = Pattern.compile("<(%@.*?)%>"); + Matcher m = null; + while (true) { + m = p.matcher(s); + if (m.find()) { + prtln ("MATCH: \"" + m.group(1) + "\""); + String repl = "<" + m.group(1) + ">"; + s = m.replaceFirst (repl); + } + else + break; + } + return s; + } /** Index: SimpleSchemaHelperTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/SimpleSchemaHelperTester.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SimpleSchemaHelperTester.java 20 Mar 2009 23:33:58 -0000 1.13 --- SimpleSchemaHelperTester.java 7 Jul 2009 03:29:38 -0000 1.14 *************** *** 110,117 **** * @param args The command line arguments */ ! public static void main(String[] args) { ! boolean truncated = false; ! String schemaName = "mast"; if (args.length > 0) --- 110,117 ---- * @param args The command line arguments */ ! public static void main(String[] args) throws Exception { ! boolean truncated = true; ! String schemaName = "framework_config"; if (args.length > 0) *************** *** 131,134 **** --- 131,137 ---- // t.recursiveNodes(); + if (t.schemaName.equals("msp2")) + t.msp2Tester(); + if (t.schemaName.equals ("sif_activity")) t.activitiesTester(); *************** *** 173,176 **** --- 176,187 ---- } + void msp2Tester () throws Exception { + String path = "/record/general/subjects/educationalSubject"; + SchemaNode schemaNode = getSchemaNode (path); + if (schemaNode == null) + throw new Exception ("schemaNode not found for " + path); + prtln (schemaNode.toString()); + } + void metsTesterOLD () throws Exception { String parentPath = "/this:mets/this:amdSec[1]"; *************** *** 279,282 **** --- 290,298 ---- } + SchemaNode getSchemaNode (String xpath) { + return sh.getSchemaNode(xpath); + } + + void enumTester () { String typeName = "roleAnnotationType"; Index: FrameworkConfigTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/FrameworkConfigTester.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrameworkConfigTester.java 20 Mar 2009 23:33:58 -0000 1.8 --- FrameworkConfigTester.java 7 Jul 2009 03:29:38 -0000 1.9 *************** *** 42,47 **** */ public class FrameworkConfigTester { ! FrameworkConfigReader reader = null; ! MetaDataFramework framework = null; FrameworkRegistry registry = null; --- 42,47 ---- */ public class FrameworkConfigTester { ! public FrameworkConfigReader reader = null; ! public MetaDataFramework framework = null; FrameworkRegistry registry = null; *************** *** 56,63 **** --- 56,65 ---- configDirPath = TesterUtils.getFrameworkConfigDir(); File sourceFile = new File(configDirPath, xmlFormat + ".xml"); + if (!sourceFile.exists()) { prtln("source File does not exist at " + sourceFile.toString()); return; } + prtln ("config: " + sourceFile); try { reader = new FrameworkConfigReader(sourceFile); *************** *** 66,102 **** prtln ("Initialization error: " + e.getMessage()); } ! ! // registry = new FrameworkRegistry(configDirPath, null); } /** * Description of the Method */ ! public void showMetaDataFramework() { ! prtln("MetaDataFramework"); ! prtln(framework.toString()); } ! /** ! * Description of the Method ! */ ! public void showRegistry() { ! prtln("REGISTRY"); ! prtln(registry.toString()); ! } ! ! public void showVocabLayouts () { ! VocabLayoutConfig layouts = framework.getVocabLayouts(); ! if (layouts != null) { ! for (Iterator i=layouts.getAllVocabLayout().iterator();i.hasNext();) { ! VocabLayout layout = (VocabLayout)i.next(); ! layout.report(); ! } ! } ! prtln ("no layouts found"); } ! ! /** * The main program for the FrameworkConfigTester class --- 68,96 ---- prtln ("Initialization error: " + e.getMessage()); } ! prtln ("schemaURI: " + framework.getSchemaURI()); } + FrameworkRegistry getFrameworkRegistry (String configDirPath) { + return new FrameworkRegistry(configDirPath, null); + } /** * Description of the Method */ ! public void showFrameworkStuff() { ! prtln("\n-----------------------"); ! prtln("FRAMEWORK Stuff"); ! prtln ("name: " + framework.getName()); ! prtln ("renderer: " + this.framework.getRenderer()); } ! public void showReaderStuff() { ! prtln("\n-----------------------"); ! prtln ("READER Stuff"); ! prtln ("name: " + this.reader.getName()); ! prtln ("xmlFormat: " + this.reader.getXmlFormat()); ! prtln ("renderer: " + this.reader.getRenderer()); } ! /** * The main program for the FrameworkConfigTester class *************** *** 108,112 **** org.dlese.dpc.schemedit.autoform.RendererHelper.setLogging(false); TesterUtils.setSystemProps(); ! String xmlFormat = "adn"; if (args.length > 0) --- 102,106 ---- org.dlese.dpc.schemedit.autoform.RendererHelper.setLogging(false); TesterUtils.setSystemProps(); ! String xmlFormat = "msp2"; if (args.length > 0) *************** *** 114,138 **** FrameworkConfigTester tester = new FrameworkConfigTester(xmlFormat); ! // prtln (tester.registry.toString()); ! // MetaDataFramework adnFramework = tester.registry.getFramework("adn"); ! ! // show (tester.reader.getDocMap().getDocument()); ! Document minnie = null; try { ! tester.framework.loadSchemaHelper(); ! minnie = tester.framework.makeMinimalRecord("FOO-ID"); ! // show(minnie); } catch (Exception e) { prtln (e.getMessage()); } ! prtln ("framework name: " + tester.reader.getName()); ! // prtln (tester.reader.getSchemaPathMap().toString()); ! ! prtln ("vocabLayoutURI: " + tester.reader.getVocabLayoutURI()); ! tester.showVocabLayouts(); } ! /** * Utility to show XML in pretty form --- 108,138 ---- FrameworkConfigTester tester = new FrameworkConfigTester(xmlFormat); + tester.showSchemaPathMap(); + // pp (tester.reader.getDocMap().getDocument()); ! // tester.showReaderStuff (); ! // tester.showFrameworkStuff(); ! // DocMap docMap = reader.getDocMap(); ! ! } ! ! public void showSchemaPathMap () { ! prtln ("\nSchemaPathMap"); ! prtln (reader.getSchemaPathMap().toString()); ! } ! ! public Document getMinimalRecord () { Document minnie = null; try { ! framework.loadSchemaHelper(); ! minnie = framework.makeMinimalRecord("FOO-ID"); ! // pp(minnie); } catch (Exception e) { prtln (e.getMessage()); } ! return minnie; } ! ! /** * Utility to show XML in pretty form *************** *** 140,144 **** *@param node Description of the Parameter */ ! public static void show(Node node) { prtln(Dom4jUtils.prettyPrint(node)); } --- 140,144 ---- *@param node Description of the Parameter */ ! public static void pp(Node node) { prtln(Dom4jUtils.prettyPrint(node)); } Index: SchemaHelperTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/SchemaHelperTester.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SchemaHelperTester.java 20 Mar 2009 23:33:58 -0000 1.12 --- SchemaHelperTester.java 7 Jul 2009 03:29:38 -0000 1.13 *************** *** 20,24 **** import org.dlese.dpc.xml.*; import org.dlese.dpc.xml.schema.*; ! import org.dlese.dpc.xml.schema.compositor.Compositor; import org.dlese.dpc.schemedit.*; import org.dlese.dpc.util.strings.*; --- 20,24 ---- import org.dlese.dpc.xml.*; import org.dlese.dpc.xml.schema.*; ! import org.dlese.dpc.xml.schema.compositor.*; import org.dlese.dpc.schemedit.*; import org.dlese.dpc.util.strings.*; *************** *** 65,74 **** * @param args The command line arguments */ ! public static void main(String[] args) { SchemaHelper.setVerbose(false); SchemaHelperTester t = null; DefinitionMiner.setDebug(false); SchemaReader.setDebug(false); ! String xmlFormat = "fields_file"; if (args.length > 0) xmlFormat = args[0]; --- 65,74 ---- * @param args The command line arguments */ ! public static void main(String[] args) throws Exception { SchemaHelper.setVerbose(false); SchemaHelperTester t = null; DefinitionMiner.setDebug(false); SchemaReader.setDebug(false); ! String xmlFormat = "dlese_anno"; if (args.length > 0) xmlFormat = args[0]; *************** *** 81,85 **** return; } ! String path = "/itemRecord/general/simpleTemporalCoverages/description"; // String path = "/itemRecord/geospatialCoverages/geospatialCoverage/body"; --- 81,89 ---- return; } ! ! // t.msp2_tests (); ! t.dlese_anno_tests (); ! ! // String path = "/itemRecord/geospatialCoverages/geospatialCoverage/body"; *************** *** 111,114 **** --- 115,143 ---- } + + void msp2_tests () throws Exception { + prtln ("msp2tests"); + String path = "/record/coverage/location_1_"; + path = XPathUtils.decodeXPath(path); + prtln ("decoded path: " + path); + path = XPathUtils.normalizeXPath(path); + prtln ("normalized path: " + path); + if (sh.getSchemaNode (path) == null) + throw new Exception ("schemaNode not found for " + path); + if (sh.isChoiceElement(path)) + prtln ("choice"); + if (sh.isMultiChoiceElement(path)) + prtln ("multichoice"); + if (sh.isRepeatingElement(path)) + prtln ("repeating"); + } + + /* + * encoded path, e.g., "/annotationRecord/annotation/contributors/contributor_1_" + */ + public void dlese_anno_tests() { + + } + void showIdRefTypes () { for (Iterator i=schemaNodeMap.getValues().iterator();i.hasNext();) { *************** *** 353,357 **** GlobalDef globalDef = (GlobalDef) globalDefMap.getValue(typeName); if (globalDef == null) { ! if (!typeName.startsWith("xsd:")) { prtln(typeName + " - not found in globalDefMap"); } --- 382,387 ---- GlobalDef globalDef = (GlobalDef) globalDefMap.getValue(typeName); if (globalDef == null) { ! String schemaNSPrefix = this.sh.getSchemaNamespace().getPrefix(); ! if (!typeName.startsWith(schemaNSPrefix + ":")) { prtln(typeName + " - not found in globalDefMap"); } *************** *** 532,536 **** */ private static void prtln(String s) { ! // System.out.println("SchemaHelperTester: " + s); System.out.println(s); } --- 562,566 ---- */ private static void prtln(String s) { ! // System.out.prtlnln("SchemaHelperTester: " + s); System.out.println(s); } Index: SequenceTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/SequenceTester.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SequenceTester.java 20 Mar 2009 23:33:58 -0000 1.4 --- SequenceTester.java 7 Jul 2009 03:29:38 -0000 1.5 *************** *** 98,107 **** // tester.printAcceptableChoices (); ! String memberName = "xsd:any"; ! CompositorMember cm = tester.sequenceCompositor.getMember(memberName); if (cm != null) prtln (cm.toString()); else ! prtln ("CM for \"" + memberName + "\" not found"); } --- 98,112 ---- // tester.printAcceptableChoices (); ! /* NOTE: we shouldn't be hardcoding "xsd" here! but i'm not positive where to ! grab the schemaNamespace. Here i'm grabbing it from the compositor, but ! this has not been tested ... ! */ ! String schemaNSPrefix = tester.sequenceCompositor.getParent().getXsdPrefix(); ! String anyTypeMemberName = NamespaceRegistry.makeQualifiedName(schemaNSPrefix, "any"); ! CompositorMember cm = tester.sequenceCompositor.getMember(anyTypeMemberName); if (cm != null) prtln (cm.toString()); else ! prtln ("CM for \"" + anyTypeMemberName + "\" not found"); } Index: XpathTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/XpathTester.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XpathTester.java 20 Mar 2009 23:33:58 -0000 1.3 --- XpathTester.java 7 Jul 2009 03:29:38 -0000 1.4 *************** *** 66,74 **** public static void main(String[] args) throws Exception { ! String path = "/home/ostwald/XML/Untitled3.xml"; ! XpathTester t = new XpathTester (path); ! t.doNodeProbes(); } /** * NOT YET DOCUMENTED --- 66,93 ---- public static void main(String[] args) throws Exception { ! // nodeProbeTester(); ! ! pathSortTester(); } + + static void pathSortTester () { + List paths = getXPaths(); + Collections.sort (paths); + for (Iterator i=paths.iterator();i.hasNext();) { + prtln ((String)i.next()); + } + } + + static List getXPaths () { + List paths = new ArrayList(); + paths.add ("/record/a"); + paths.add ("/record/b[1]"); + paths.add ("/record/b[12]"); + paths.add ("/record/b[2]"); + return paths; + } + + /** * NOT YET DOCUMENTED *************** *** 80,83 **** --- 99,108 ---- } + static void nodeProbeTester () throws Exception { + String path = "/home/ostwald/XML/Untitled3.xml"; + XpathTester t = new XpathTester (path); + t.doNodeProbes(); + } + void doNodeProbes () { nodeProbe ("/cd:cd"); *************** *** 164,182 **** } ! /** ! * NOT YET DOCUMENTED ! * ! * @param aFile NOT YET DOCUMENTED ! * @return NOT YET DOCUMENTED ! * @exception DocumentException NOT YET DOCUMENTED ! */ ! public static Document parseWithSAX(File aFile) throws Exception { ! SAXReader xmlReader = new SAXReader(); ! return xmlReader.read(aFile); ! } ! public static Document parseWithSAX(URL url) throws Exception { ! SAXReader xmlReader = new SAXReader(); ! return xmlReader.read(url); ! } } --- 189,193 ---- } ! } Index: RenderTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/RenderTester.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RenderTester.java 20 Mar 2009 23:33:58 -0000 1.11 --- RenderTester.java 7 Jul 2009 03:29:38 -0000 1.12 *************** *** 35,40 **** * Class for testing metadata editor rendering on a specific node of a specific framework * ! *@author ostwald<p> ! $Id $ */ public class RenderTester { --- 35,39 ---- * Class for testing metadata editor rendering on a specific node of a specific framework * ! *@author ostwald */ public class RenderTester { *************** *** 60,67 **** String configFilePath = configFile.toString(); if (!configFile.exists()) { ! prtln("propfile doesn't exist at " + configFilePath); return; } else { framework = new MetaDataFramework(configFilePath, docRoot); } --- 59,67 ---- String configFilePath = configFile.toString(); if (!configFile.exists()) { ! prtln("configFile doesn't exist at " + configFilePath); return; } else { + prtln ("frameworkConfig: " + configFilePath); framework = new MetaDataFramework(configFilePath, docRoot); } *************** *** 98,120 **** "C:/Documents and Settings/ostwald/devel/SIF/dcs_config/sifTypePaths"); String xmlFormat = null; ! String renderpath = null; ! // xmlFormat = "mets"; ! xmlFormat = "mast"; if (args.length > 0) xmlFormat = args[0]; ! String renderPath = null; ! // renderPath = "/record/general/subjects"; ! // renderPath = "/concept/contents"; ! // renderPath = "/itemRecord/general/keywords"; ! // renderPath = "/sif:Activity"; ! // renderPath = "/metadataFieldInfo/field/bestPractices"; ! // renderPath = "/record/educational/standards/asnID"; ! // renderPath = "/this:mets/this:fileSec/this:fileGrp"; ! // renderPath = "/annotationRecord/moreInfo"; ! renderPath = "/record/educational/standards/asnID"; ! // renderPath = "/this:mets"; if (args.length > 1) renderPath = args[1]; --- 98,114 ---- "C:/Documents and Settings/ostwald/devel/SIF/dcs_config/sifTypePaths"); String xmlFormat = null; ! String renderPath = null; ! xmlFormat = "msp2"; if (args.length > 0) xmlFormat = args[0]; + if (args.length > 1) + renderPath = args[1]; ! ! // renderPath = "/smileItem/authorshipRights"; ! renderPath = "/record/lifecycle/contributor"; ! if (args.length > 1) renderPath = args[1]; *************** *** 125,135 **** dumpJsp = true; ! // RenderTester rt = new RenderTester(xmlFormat); - // to test with suggestor ... - String stdConfig = "C:/tmp/tmpSuggestionServiceConfig.xml"; - // String stdConfig = "/Library/Java/Extensions/tomcat/jakarta-tomcat-5.5.9/var/dcs_conf/suggestionServiceConfig.xml"; - RenderTester rt = new RenderTester(xmlFormat, stdConfig); - AutoForm autoForm = null; try { --- 119,133 ---- dumpJsp = true; ! RenderTester rt = null; ! boolean useStandards = false; ! if (useStandards) { ! // to test with suggestor ... ! String stdConfig = "C:/tmp/tmpSuggestionServiceConfig.xml"; ! rt = new RenderTester(xmlFormat, stdConfig); ! } ! else { ! rt = new RenderTester(xmlFormat); ! } AutoForm autoForm = null; try { *************** *** 141,146 **** } ! // rt.sh.showSchemaNodeMap(); ! // rt.sh.showGlobalDefs(); if (renderPath == null) --- 139,144 ---- } ! // SchemaUtils.showSchemaNodeMap(rt.sh); ! // SchemaUtils.showGlobalDefs(rt.sh); if (renderPath == null) Index: TransformTester.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/test/TransformTester.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TransformTester.java 20 Mar 2009 23:33:58 -0000 1.2 --- TransformTester.java 7 Jul 2009 03:29:38 -0000 1.3 *************** *** 43,47 **** // If the TransformerFactory class is available, use it: if ( result != null ) { ! System.setProperty( "javax.xml.transform.TransformerFactory", defaultClass ); } } catch (Exception e) { --- 43,47 ---- // If the TransformerFactory class is available, use it: if ( result != null ) { ! // System.setProperty( "javax.xml.transform.TransformerFactory", defaultClass ); } } catch (Exception e) { |