[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/tools MaakLosseItems.java,1.1,1.2 SimpleAddItem.java,1.1,1.2

[Egon W. <eg...@us...>]

Update of /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools
In directory usw-pr-cvs1:/tmp/cvs-serv16680/source/wocjava/source/com/egonw/woc/tools

Modified Files:
	MaakLosseItems.java SimpleAddItem.java 
Log Message:
Added scripts to convert wml 2 html. And fixed some things along the way.


Index: MaakLosseItems.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/MaakLosseItems.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MaakLosseItems.java	8 Jun 2002 20:29:03 -0000	1.1
--- MaakLosseItems.java	15 Aug 2002 12:02:07 -0000	1.2
***************
*** 11,17 ****
  import com.egonw.woc.predicate.*;
  import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
  
  class MaakLosseItems {
--- 11,17 ----
  import com.egonw.woc.predicate.*;
  import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
  
  class MaakLosseItems {
***************
*** 52,56 ****
          // setting default repository
          String url = "file://" + reposdeffile;
!         repository = new Path("woc", url);
  
          WocEngine we = new WocEngine(repository);
--- 52,56 ----
          // setting default repository
          String url = "file://" + reposdeffile;
!         repository = new Path(repos, url);
  
          WocEngine we = new WocEngine(repository);

Index: SimpleAddItem.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/SimpleAddItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SimpleAddItem.java	8 Jun 2002 20:29:03 -0000	1.1
--- SimpleAddItem.java	15 Aug 2002 12:02:07 -0000	1.2
***************
*** 1,19 ****
  package com.egonw.woc.tools;
! 
! import com.objectspace.jgl.*;
! import com.objectspace.jgl.algorithms.*;
! import com.objectspace.jgl.predicates.*;
! import java.io.*;
! import java.util.*;
! import com.egonw.woc.*;
! import com.egonw.woc.files.*;
! import com.egonw.woc.util.*;
! import com.egonw.woc.predicate.*;
! import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
! 
! class SimpleAddItem {
  
      private static final String pClass = "org.apache.xerces.parsers.SAXParser";
--- 1,19 ----
  package com.egonw.woc.tools;
! 
! import com.objectspace.jgl.*;
! import com.objectspace.jgl.algorithms.*;
! import com.objectspace.jgl.predicates.*;
! import java.io.*;
! import java.util.*;
! import com.egonw.woc.*;
! import com.egonw.woc.files.*;
! import com.egonw.woc.util.*;
! import com.egonw.woc.predicate.*;
! import com.egonw.woc.exception.*;
! import org.openscience.dadml.*;
! import org.openscience.dadml.filereaders.*;
! import org.openscience.dadml.tools.*;
! 
! class SimpleAddItem {
  
      private static final String pClass = "org.apache.xerces.parsers.SAXParser";
***************
*** 29,32 ****
--- 29,36 ----
      System.out.println(title + " v." + version + " (" + date + ")");
      int length = args.length;
+     
+     String reposdeffile = "file:///vol/www/woc/bin/repository_def.xml";
+     String repos = "woc";
+ 
      if (length > 0) {
        String f = "";
***************
*** 35,63 ****
          for (int i = 0; i < length; i++) {
            if (args[i].equals("-r") && ((i+1) < length)) {
! 	      i++;
!   	      repository = new Path(args[i]);
                System.out.println("  repository: " + args[i]);
!   	  } else if (args[i].equals("-m") && ((i+1) < length)) {
! 	      i++;
                module = args[i];
! 	      System.out.println("      module: " + args[i]);
            }
          }
! 	// file is considered the last argument
! 	f = args[length-1];
        } else {
          f = args[0];
        }
!       // setting default repository
!       if (repository == null) {
!         repository = new Path("woc");
!       }
  
        WocEngine we = new WocEngine(repository);
        we.setWoordTable(new WoordTable());
        try {
! 	we.setWocReportFile(new WocReportFile("WMLreport.txt"));
        } catch (IOException e) {
! 	System.out.println(e);
        }
        System.out.println("Reading data...");
--- 39,71 ----
          for (int i = 0; i < length; i++) {
            if (args[i].equals("-r") && ((i+1) < length)) {
!               i++;
                System.out.println("  repository: " + args[i]);
!               repos = args[i];
!           } else if (args[i].equals("-R") && ((i+1) < length)) {
!               i++;
!               reposdeffile = args[i];
!               System.out.println("  reposdeffile: " + reposdeffile);
!           } else if (args[i].equals("-m") && ((i+1) < length)) {
!               i++;
                module = args[i];
!               System.out.println("      module: " + args[i]);
            }
          }
!         // file is considered the last argument
!         f = args[length-1];
        } else {
          f = args[0];
        }
! 
!         // setting default repository
!         String url = "file://" + reposdeffile;
!         repository = new Path(repos, url);
  
        WocEngine we = new WocEngine(repository);
        we.setWoordTable(new WoordTable());
        try {
!           we.setWocReportFile(new WocReportFile("WMLreport.txt"));
        } catch (IOException e) {
!           System.out.println(e);
        }
        System.out.println("Reading data...");
***************
*** 69,109 ****
        we.read();
  
! 	System.out.println("Downloading DADML database definitions...");
! 	DBDEFLIST dbdeflist = new DBDEFLIST();
! 	DBLIST dblist = new DBLIST();
! 	String superXML = "http://www.sci.kun.nl/woc/super.xml";
! 	try {
! 	    System.err.println("Downloading: " + superXML);
! 	    dblist = DBLISTFileReader.read(superXML, pClass);
  	} catch (Exception supererror) {
! 	    System.err.println(supererror.toString());
! 	    return;
! 	}
! 	Enumeration dbases = dblist.databases();
! 	while (dbases.hasMoreElements()) {
! 	    DATABASE db = (DATABASE)dbases.nextElement();
! 	    String dburl = db.getURL()+db.getDefinition();
! 	    DBDEF dbdef = new DBDEF();
! 	    try {
! 		System.err.println("Downloading: " + dburl);
! 		dbdef = DBDEFFileReader.read(dburl, pClass);
! 		dbdeflist.addDBDEF(dbdef);
! 	    } catch (Exception deferror) {
! 		System.err.println(deferror.toString());
! 		return;
! 	    }
! 	}
! 	
! 
!       System.out.println("Expanding item...");
!       we.setConvertAble(new Expander());
!       we.convert();
! 
! //     System.out.println("Marking up items...");
! //     if (module.length() > 0) {
! // 	try {
! //             Class c = Woord.class.getClassLoader().loadClass("com.egonw.woc.util." + module);
! //             we.setConvertAble((ConvertAble)c.newInstance());
! //             we.convert();
  //         } catch (ClassCastException e) {
  //             System.out.println("Object " + module + " is not a module!");
--- 77,117 ----
        we.read();
  
! 	System.out.println("Downloading DADML database definitions...");
! 	DBDEFLIST dbdeflist = new DBDEFLIST();
! 	DBLIST dblist = new DBLIST();
! 	String superXML = "http://www.sci.kun.nl/woc/super.xml";
! 	try {
! 	    System.err.println("Downloading: " + superXML);
! 	    dblist = DBLISTFileReader.read(superXML, pClass);
  	} catch (Exception supererror) {
! 	    System.err.println(supererror.toString());
! 	    return;
! 	}
! 	Enumeration dbases = dblist.databases();
! 	while (dbases.hasMoreElements()) {
! 	    DATABASE db = (DATABASE)dbases.nextElement();
! 	    String dburl = db.getURL()+db.getDefinition();
! 	    DBDEF dbdef = new DBDEF();
! 	    try {
! 		System.err.println("Downloading: " + dburl);
! 		dbdef = DBDEFFileReader.read(dburl, pClass);
! 		dbdeflist.addDBDEF(dbdef);
! 	    } catch (Exception deferror) {
! 		System.err.println(deferror.toString());
! 		return;
! 	    }
! 	}
! 	
! 
!       System.out.println("Expanding item...");
!       we.setConvertAble(new Expander());
!       we.convert();
! 
! //     System.out.println("Marking up items...");
! //     if (module.length() > 0) {
! // 	try {
! //             Class c = Woord.class.getClassLoader().loadClass("com.egonw.woc.util." + module);
! //             we.setConvertAble((ConvertAble)c.newInstance());
! //             we.convert();
  //         } catch (ClassCastException e) {
  //             System.out.println("Object " + module + " is not a module!");