woc-commit — CVS commit messages are posted to this list.

[Woc-commit] CVS: woc/data/wml .cvsignore,1.2,1.3 Makefile.am,1.3,1.4 syncwoclist.pl.in,1.1,1.2 woclist.xml,1.1,1.2

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

Update of /cvsroot/woc/woc/data/wml
In directory sc8-pr-cvs1:/tmp/cvs-serv24845/data/wml

Modified Files:
	.cvsignore Makefile.am syncwoclist.pl.in woclist.xml 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore	14 Jan 2004 13:01:56 -0000	1.2
--- .cvsignore	14 Jan 2004 15:44:42 -0000	1.3
***************
*** 2,3 ****
--- 2,4 ----
  Makefile.in
  tmp
+ *.pl

Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	14 Jan 2004 12:49:49 -0000	1.3
--- Makefile.am	14 Jan 2004 15:44:42 -0000	1.4
***************
*** 2,3 ****
--- 2,6 ----
  
  SUBDIRS=
+ 
+ wmldir=${prefix}/web-docs/wocjava
+ wml_DATA=woclist.xml

Index: syncwoclist.pl.in
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/syncwoclist.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** syncwoclist.pl.in	14 Jan 2004 13:27:13 -0000	1.1
--- syncwoclist.pl.in	14 Jan 2004 15:44:42 -0000	1.2
***************
*** 1,3 ****
! #! @PATHTOPERL@
  use strict;

  use diagnostics;

--- 1,3 ----
! #! @PATHTOPERL@

  use strict;

  use diagnostics;

***************
*** 15,19 ****
  } else {

    $newdir = "tmp/";

!   $orgdir = "../../../../share/woc/data/wml/";

  }

  

--- 15,19 ----
  } else {

    $newdir = "tmp/";

!   $orgdir = "@PHYSPATH@/web-docs/data/wml/";

  }

  

***************
*** 23,29 ****
     my $orgfile = $newfile;

     $orgfile =~ s/^$newdir//;

!    my $subdir = (substr $orgfile, 0, 1)."/";

!    $subdir =~ s/[0-9]/123/;

!    $orgfile = $orgdir.$subdir.$orgfile;

     if (-s $orgfile) {

        my $diff = `diff $newfile $orgfile`;

--- 23,27 ----
     my $orgfile = $newfile;

     $orgfile =~ s/^$newdir//;

!    $orgfile = $orgdir.$orgfile;

     if (-s $orgfile) {

        my $diff = `diff $newfile $orgfile`;


Index: woclist.xml
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/woclist.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** woclist.xml	14 Jan 2004 13:01:56 -0000	1.1
--- woclist.xml	14 Jan 2004 15:44:42 -0000	1.2
***************
*** 4,7 ****
--- 4,16 ----
           xmlns:import="http://www.sci.kun.nl/woc/import"
           xmlns:xlink="http://www.sci.kun.nl/woc/topicmap">
+ <ITEM NAME="1-butoxy 2-propanol" ID="WOC00001737" CLASS="CHEMICAL" FILE="1butoxy2propanol">
+   <DICT>
+     <NAME CLASS="IUPAC">
+       <LANG ID="EN">1-butoxy 2-propanol</LANG>
+       <LANG ID="NL">1-butoxy 2-propanol</LANG>
+     </NAME>
+   </DICT>
+   <INDEX CLASS="CAS-NUMBER">5131-66-8</INDEX>
+ </ITEM>
  <ITEM NAME="1,1,1-trichloorethaan" ID="WOC00001542" CLASS="CHEMICAL" FILE="111trichloorethaan">
    <DICT>

[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/tools SimpleAddItem.java,1.4,1.5

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

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

Modified Files:
	SimpleAddItem.java 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

Index: SimpleAddItem.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/SimpleAddItem.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** SimpleAddItem.java	14 Jan 2004 13:07:57 -0000	1.4
--- SimpleAddItem.java	14 Jan 2004 15:44:43 -0000	1.5
***************
*** 7,12 ****
  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.*;
--- 7,12 ----
  import java.util.*;
  import com.egonw.woc.*;
  import com.egonw.woc.util.*;
+ import com.egonw.woc.files.*;
  import com.egonw.woc.predicate.*;
  import com.egonw.woc.exception.*;
***************
*** 15,18 ****
--- 15,22 ----
  import org.openscience.dadml.tools.*;
  
+ /**
+  * @author     egonw
+  * @created    January 14, 2004
+  */
  class SimpleAddItem {
  
***************
*** 20,153 ****
  
      private static String title = "WOC.SimpleAddItem";
!     private static String version = "1.4";
!     private static String date = "23-02-2001";
  
      private static Path repository;
      private static String module = "";
  
!   public static void main(String[] args) {
!     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 = "";
!       if (length > 1) {
!         System.out.println("Parsing arguments...");
!         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...");
!       if (!(f.endsWith(".xml"))) {
!           f = f + ".xml";
!       }
!       WMLReadFile rf = new WMLReadFile(repository, f);
!       we.setReadFile((FileReadAble)rf);
!       we.read();
! 
! 	System.out.println("Downloading DADML database definitions...");
! 	DBDEFLIST dbdeflist = new DBDEFLIST();
! 	DBLIST dblist = new DBLIST();
! 	String superXML = "http://www.woc.sci.kun.nl/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!");
! // 	} catch (ClassNotFoundException e) {
! // 	    System.out.println("Module " + module + " not found!");
! // 	} catch (Exception e) {
! // 	    System.out.println("Error: " + e);
! // 	}
! //     }
! 
!       System.out.print("Writing data...");
!       Enumeration values = we.getWTElements();
!       while (values.hasMoreElements()) {
!         Item i = (Item)values.nextElement();
!         System.out.println("Processing: " +(String)i.get(Item.NAME));
!         we.setFilterPredicate(
!           new BindSecondPredicate( new IsName(),
!           (String)i.get(Item.NAME) ) );
          try {
!           String filename = repository.getPhysicalRoot() +
!                             repository.getItemFileSubDir() +
!                             (String)i.get(Item.ANCHOR) + ".shtml";
!           System.out.println("Filename: " + filename);
!           ItemWriteFile iwf = new ItemWriteFile(repository, filename,
!             ItemFile.LONG, dbdeflist);
!           we.setWriteFile((FileWriteAble)iwf);
!           we.write();
!           iwf.close();
! 	} catch (IOException e) {
              System.out.println(e);
! 	};
!       };
  
!       System.out.println();
!     } else {
!       System.out.println("syntax: java SimpleAddItem [-r repository] <item.xml>");
      }
-   }
  }
--- 24,136 ----
  
      private static String title = "WOC.SimpleAddItem";
!     private static String version = "1.0.0";
!     private static String date = "2004-01-14";
  
+     private static String path = "woc";
      private static Path repository;
      private static String module = "";
  
! 
!     /**
!      * The main program for the SimpleAddItem class.
!      *
!      * @param  args  The command line arguments
!      */
!     public static void main(String[] args) {
! 
!         String reposdeffile = "file:///vol/www/woc/woc3/bin/wml2html/repository_def.xml";
!         String repos = "woc";
! 
!         System.out.println(title + " v." + version + " (" + date + ")");
!         int length = args.length;
!         if (length > 1) {
!             System.out.println("Parsing arguments...");
!             for (int i = 0; i < length - 1; i++) {
!                 if (args[i].equals("-r") && ((i + 1) < length)) {
!                     i++;
!                     path = args[i];
!                     System.out.println("  repository: " + args[i]);
!                 } else if ("-R".equals(args[i]) && ((i + 1) < length)) {
!                     reposdeffile = args[i + 1];
!                     System.out.println("  reposdeffile: " + args[i + 1]);
!                     i++;
!                 } else {
!                     System.out.println("Unknown option: " + args[i]);
!                     System.exit(1);
!                 }
!             }
          }
!         String code = args[args.length - 1];
  
          // setting default repository
!         String url = 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);
!         }
!         String readfile = "woclist.xml";
!         System.out.println("Reading " + readfile + "...");
!         WocListReadFile rf = new WocListReadFile(repository, readfile);
!         we.setReadFile((FileReadAble) rf);
!         we.read();
! 
!         System.out.println("Downloading DADML database definitions...");
!         DBDEFLIST dbdeflist = new DBDEFLIST();
!         DBLIST dblist = new DBLIST();
!         String superXML = "http://www.woc.sci.kun.nl/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("Adding group items...");
!         we.setConvertAble(new GroupAdder());
!         we.convert();
  
!         System.out.print("Writing data...");
!         we.setFilterPredicate(
!                 new BindSecondPredicate(new IsCode(), code)
!                 );
!         Enumeration values = we.getWTElements();
!         while (values.hasMoreElements()) {
!             Item i = (Item)values.nextElement();
!             if (i.get(XItem.XCODE).equals(code)) {
!                 try {
!                     System.out.println("  " + (String) i.get(Item.NAME) + " -> " + (String) i.get(XItem.XFILENAME));
!                     ItemWriteFile iwf = new ItemWriteFile(repository,
!                         repository.getPhysicalRoot() + repository.getItemFileSubDir() +
!                         (String) i.get(XItem.XFILENAME) + ".shtml", ItemFile.LONG,
!                         dbdeflist);
!                     we.setWriteFile((FileWriteAble) iwf);
!                     we.write();
!                     iwf.close();
!                 } catch (IOException e) {
!                     System.out.println(e);
!                 }
!             }
!         }
      }
  }
+ 

[Woc-commit] CVS: woc/data/wml/templates chemical.xml,1.3,1.4 element.xml,1.2,1.3

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

Update of /cvsroot/woc/woc/data/wml/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv24845/data/wml/templates

Modified Files:
	chemical.xml element.xml 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

Index: chemical.xml
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/templates/chemical.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** chemical.xml	13 Jun 2002 19:48:52 -0000	1.3
--- chemical.xml	14 Jan 2004 15:44:42 -0000	1.4
***************
*** 1,4 ****
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <!DOCTYPE ITEM PUBLIC "-//www-woc.sci.kun.nl//DTD WOC Markup Language V1.0//EN" "http://www-woc.sci.kun.nl/wocml.dtd">
  <ITEM NAME="$item" ID="$wocnumber" CLASS="CHEMICAL" CODE="$code">
    <DICT>
--- 1,2 ----
***************
*** 17,20 ****
--- 15,19 ----
    </DICT>
    <INDEX CLASS=""></INDEX>
+   <INDEX CLASS="CAS-NUMBER">$cas</INDEX>
    <!-- classes: CAS-NUMBER, WOC-NUMBER, UN-NUMBER, E-NUMBER,
                  SMILES, MSDS-CODE -->
***************
*** 39,41 ****
--- 38,46 ----
    <!-- mimes: chemical/cml
         classes: PhysicalProperties -->
+   <molecule id="$cas" convention="DictOrgChem">
+     <float title="BoilingPoint" units="degrees Celsius"></float>
+     <float title="MeltingPoint" units="degrees Celsius"></float>
+     <string title="Stoichiometry">C<sub></sub>H<sub></sub>O<sub></sub></string>
+     <string title="StoichiometryID">C000ZH000YO000X</string>
+   </molecule>
  </ITEM>

Index: element.xml
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/templates/element.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** element.xml	13 Jun 2002 19:47:03 -0000	1.2
--- element.xml	14 Jan 2004 15:44:42 -0000	1.3
***************
*** 1,4 ****
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <!DOCTYPE ITEM PUBLIC "-//www-woc.sci.kun.nl//DTD WOC Markup Language V1.0//EN" "http://www-woc.sci.kun.nl/wocml.dtd">
  <ITEM NAME="$item" ID="$wocnumber" CLASS="ELEMENT" CODE="$code">
    <DICT>
--- 1,2 ----

[Woc-commit] CVS: woc/source/wocjava Makefile.am,1.6,1.7

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

Update of /cvsroot/woc/woc/source/wocjava
In directory sc8-pr-cvs1:/tmp/cvs-serv24845/source/wocjava

Modified Files:
	Makefile.am 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am	17 Aug 2002 13:11:30 -0000	1.6
--- Makefile.am	14 Jan 2004 15:44:42 -0000	1.7
***************
*** 15,19 ****
  JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
  
! all: jar
  
  classes:
--- 15,19 ----
  JARS=`ls -1 ../../lib/java/*.jar | perl -ne "s/\n|\r/:/g; print;"`
  
! all: wocjava.jar
  
  classes:
***************
*** 34,37 ****
  	cd build; rm -fR *
  
! jar: classes
! 	cd build; ${JAR} cf ../wocjava.jar com/*
--- 34,38 ----
  	cd build; rm -fR *
  
! wocjava.jar: classes
! 	cd build; ${JAR} cf wocjava.jar com/*
! 	cp build/wocjava.jar .

[Woc-commit] CVS: woc/bin/wml2html Makefile.in,1.1,NONE

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

Update of /cvsroot/woc/woc/bin/wml2html
In directory sc8-pr-cvs1:/tmp/cvs-serv24845/bin/wml2html

Removed Files:
	Makefile.in 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

--- Makefile.in DELETED ---

[Woc-commit] CVS: woc configure.in,1.15,1.16

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

Update of /cvsroot/woc/woc
In directory sc8-pr-cvs1:/tmp/cvs-serv24845

Modified Files:
	configure.in 
Log Message:
Final tweaks. I can now add one item reasonably easy. See woc website: 1-butoxy-2-propanol

Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** configure.in	14 Jan 2004 13:08:14 -0000	1.15
--- configure.in	14 Jan 2004 15:44:42 -0000	1.16
***************
*** 90,93 ****
--- 90,96 ----
     data/Makefile
     data/wml/Makefile
+    data/wml/splitwoclist.pl
+    data/wml/syncwoclist.pl
+    data/wml/woclist.pl
     data/dadml/Makefile
     data/dadml/physicalprop/Makefile

[Woc-commit] CVS: woc/data/wml splitwoclist.pl.in,NONE,1.1 syncwoclist.pl.in,NONE,1.1 woclist.pl.in,NONE,1.1 splitwoclist.pl,1.1,NONE syncwoclist.pl,1.1,NONE woclist.pl,1.1,NONE

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

Update of /cvsroot/woc/woc/data/wml
In directory sc8-pr-cvs1:/tmp/cvs-serv27630

Added Files:
	splitwoclist.pl.in syncwoclist.pl.in woclist.pl.in 
Removed Files:
	splitwoclist.pl syncwoclist.pl woclist.pl 
Log Message:
Use configure to set path to perl

--- NEW FILE: splitwoclist.pl.in ---
#! @PATHTOPERL@ 
use strict;
use diagnostics;

# Author: Geert Josten

# hulp-script gebruikt door wocml.sh

my $infile;
my $outdir;
my $outfile;

if (@ARGV >= 2) {
  $infile = shift;
  $outdir = shift;
} else {
  $infile = "woclist.xml";
  $outdir = "tmp/";
}

open (INFILE, "$infile");

my $inheader = 1;
my $fileisopen = 0;
my $incml = 0;
my $header = "";

while (<INFILE>) {
  my $file;
  if (/DOCTYPE woclist/i) {
    s#<!DOCTYPE woclist.*>#<!DOCTYPE ITEM PUBLIC \"-//www-woc.sci.kun.nl//DTD WOC Markup Language V1.0//EN\" \"http://www-woc.sci.kun.nl/wocml.dtd\">#i;
    $header .= $_;
  } elsif (/<woclist/i) {
    $inheader = 0;
    $fileisopen = 0;
  } elsif (/<ITEM.*?FILE=\"(.*?)\"/i) {
#    print OUTFILE "\n" if $fileisopen;
    my $outfile = $outdir.$1.".xml";
    s/FILE/CODE/i;
    if (open (OUTFILE, ">$outfile")) {
       $fileisopen = 1;
       print OUTFILE $header;
       print OUTFILE;
    } else {
       warn "Cannot write to file $outfile!\n";
       $fileisopen = 0;
    }
    $inheader = 0;
  } elsif (/<\/woclist/i) {
  } elsif (/(.*?)<!-- \[(INSERT.*?)\](.*?)\[(\/INSERT)\] -->(.*)/i) {
    print OUTFILE "$1<$2>$3<$4>$5\n";
    $incml = 1;
  } elsif (/<\/molecule/i) {
    $incml = 0;
  } elsif ($inheader) {
    $header .= $_
  } else {
    print OUTFILE if $fileisopen && ! $incml;
  }
}

# zoals in Convert.java
sub NAMELikeToANCHORLike {
 # heeft 1 parameter
 my $param = shift @_;

 $param =~ s/^\s*(.*?)\s*$/$1/ig;
 $param =~ s/\ /\_/g;
 $param =~ s/[,|.|<|>]//g;
 $param =~ tr/[A-Z]/[a-z]/;

 return $param;
}

--- NEW FILE: syncwoclist.pl.in ---
#! @PATHTOPERL@
use strict;

use diagnostics;



# Author: Geert Josten



# hulp-script gebruikt door wocml.sh



my $newdir;

my $orgdir;



if (@ARGV >= 2) {

  $newdir = shift;

  $orgdir = shift;

} else {

  $newdir = "tmp/";

  $orgdir = "../../../../share/woc/data/wml/";

}



my @newfiles = glob $newdir."*.xml";



foreach my $newfile (@newfiles) {

   my $orgfile = $newfile;

   $orgfile =~ s/^$newdir//;

   my $subdir = (substr $orgfile, 0, 1)."/";

   $subdir =~ s/[0-9]/123/;

   $orgfile = $orgdir.$subdir.$orgfile;

   if (-s $orgfile) {

      my $diff = `diff $newfile $orgfile`;

      if ($diff) {

         warn "Original file different from $newfile!\n";

      }

   } else {

      warn "Original file $orgfile of $newfile not found!\n";

   }

}


--- NEW FILE: woclist.pl.in ---
#! @PATHTOPERL@
use strict;
use diagnostics;

# Author: Geert Josten

# hulp-script gebruikt door wocml.sh

#my $cmldir="../../data/dadml/physicalprop/cml";
my $cmldir="../../../../share/woc/data/dadml/physicalprop/cml";
my $infile;
my $outfile;

if (@ARGV >= 2) {
  $infile = shift;
  $outfile = shift;
} else {
  $infile = "woclist.tmp2.xml";
  $outfile = "woclist.xml";
}

open (INFILE, "$infile");
open (OUTFILE, ">$outfile");

#print eerste regel alvast
$_ = <INFILE>; print OUTFILE;

while (<INFILE>) {
  my $file;
  if (/ITEM.*?CODE=/i) {
    s/CODE/FILE/i;
    print OUTFILE;
  } elsif (/INSERT.*PhysicalProperties.*>(.*)</i) {
    my @inserts = `awk '/<molecule/,/<\\/molecule/{print " ",\$0}' $cmldir/$1`;
    s/<(INSERT.*?)>(.*?)<\/INSERT>/<!-- \[$1\]$2\[\/INSERT\] -->/i;
    print OUTFILE;
    foreach my $insert (@inserts) {
      if ($insert =~ /^(.*Stoichiometry.*>)(.*)(<.*)$/i) {
        my $pre = $1;
        my $bruto = $2;
        my $brutoID = $2;
        my $post = $3;
        $bruto =~ s/(\d+)/<sub>$1<\/sub>/ig;
        print OUTFILE $pre,$bruto,$post,$/;
        $pre =~ s/Stoichiometry/StoichiometryID/i;
        $brutoID =~ s/(\d+)/{$1}/ig;
        while ($brutoID =~ /\{(\d+?)\}/) {
          my $number = sprintf "%04i", $1;
          $brutoID =~ s/\{\d+?\}/$number/;
        }
        print OUTFILE $pre,$brutoID,$post,$/;
      } else {
        print OUTFILE $insert;
      }
    }
  } elsif (/\<\?xml.*\?\>/i) {
    s/\<\?xml.*\?\>//i;
    print OUTFILE;
  } else {
    print OUTFILE;
  }
}

# zoals in Convert.java
sub NAMELikeToANCHORLike {
 # heeft 1 parameter
 my $param = shift @_;

 $param =~ s/^\s*(.*?)\s*$/$1/ig;
 $param =~ s/\ /\_/g;
 $param =~ s/[,|.|<|>]//g;
 $param =~ tr/[A-Z]/[a-z]/;

 return $param;
}

--- splitwoclist.pl DELETED ---

--- syncwoclist.pl DELETED ---

--- woclist.pl DELETED ---

[Woc-commit] CVS: woc/lib/xml/dtd Makefile.am,NONE,1.1

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

Update of /cvsroot/woc/woc/lib/xml/dtd
In directory sc8-pr-cvs1:/tmp/cvs-serv25572/xml/dtd

Added Files:
	Makefile.am 
Log Message:
Added DTDs to install list

--- NEW FILE: Makefile.am ---
dtddir=${prefix}/lib/xml/dtd
dtd_DATA= catalog cml_custom.dtd tm_custom.dtd wocimports.dtd woclist.dtd wocml.dtd \
          xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent XHTML_1.0_WocCustomized

EXTRA_DIST=

[Woc-commit] CVS: woc/lib/xml Makefile.am,NONE,1.1

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

Update of /cvsroot/woc/woc/lib/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv25572/xml

Added Files:
	Makefile.am 
Log Message:
Added DTDs to install list

--- NEW FILE: Makefile.am ---
SUBDIRS= dtd

[Woc-commit] CVS: woc/lib Makefile.am,1.1,1.2

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

Update of /cvsroot/woc/woc/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv25572

Modified Files:
	Makefile.am 
Log Message:
Added DTDs to install list

Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/lib/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	15 Aug 2002 11:02:41 -0000	1.1
--- Makefile.am	14 Jan 2004 13:17:45 -0000	1.2
***************
*** 1,4 ****
  PREFIX="@prefix@"
! SUBDIRS= java
  
  EXTRA_DIST=
--- 1,4 ----
  PREFIX="@prefix@"
! SUBDIRS= java xml
  
  EXTRA_DIST=

[Woc-commit] CVS: woc/bin/wml2html insert-item.in,1.3,1.4 make-groups.in,1.2,1.3 make-items.in,1.2,1.3 make-woord.in,1.2,1.3

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

Update of /cvsroot/woc/woc/bin/wml2html
In directory sc8-pr-cvs1:/tmp/cvs-serv24304/wml2html

Modified Files:
	insert-item.in make-groups.in make-items.in make-woord.in 
Log Message:
Getting this baby started again (monday evening session)

Index: insert-item.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/insert-item.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** insert-item.in	17 Aug 2002 11:42:51 -0000	1.3
--- insert-item.in	14 Jan 2004 13:10:52 -0000	1.4
***************
*** 25,30 ****
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]
! || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`
--- 25,29 ----
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`

Index: make-groups.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/make-groups.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** make-groups.in	17 Aug 2002 11:43:36 -0000	1.2
--- make-groups.in	14 Jan 2004 13:10:52 -0000	1.3
***************
*** 10,15 ****
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]
! || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`
--- 10,14 ----
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`

Index: make-items.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/make-items.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** make-items.in	17 Aug 2002 11:43:36 -0000	1.2
--- make-items.in	14 Jan 2004 13:10:52 -0000	1.3
***************
*** 8,13 ****
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]
! || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`
--- 8,12 ----
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`

Index: make-woord.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/wml2html/make-woord.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** make-woord.in	17 Aug 2002 11:43:36 -0000	1.2
--- make-woord.in	14 Jan 2004 13:10:52 -0000	1.3
***************
*** 8,13 ****
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ]
! || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`
--- 8,12 ----
  
  # convert the unix path to windows
! if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "posix" ] ; then
     JARS=`cygpath --path --windows "$JARS"`
     OPTIONS=`cygpath --path --windows "$OPTIONS"`

[Woc-commit] CVS: woc/bin/lire report.pl.in,1.1,1.2

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

Update of /cvsroot/woc/woc/bin/lire
In directory sc8-pr-cvs1:/tmp/cvs-serv24304/lire

Modified Files:
	report.pl.in 
Log Message:
Getting this baby started again (monday evening session)

Index: report.pl.in
===================================================================
RCS file: /cvsroot/woc/woc/bin/lire/report.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** report.pl.in	21 Jul 2002 15:47:12 -0000	1.1
--- report.pl.in	14 Jan 2004 13:10:52 -0000	1.2
***************
*** 4,9 ****
  
  # these parameters can be customized
! #my $EMAIL = "woc\@sci.kun.nl";
! my $EMAIL = "egonw\@sci.kun.nl";
  my $TMPLOG = "/tmp/woc/woc.log";
  my $WOCLOG = "/tmp/woc/woc";
--- 4,9 ----
  
  # these parameters can be customized
! my $EMAIL = "woc\@sci.kun.nl";
! #my $EMAIL = "egonw\@sci.kun.nl";
  my $TMPLOG = "/tmp/woc/woc.log";
  my $WOCLOG = "/tmp/woc/woc";
***************
*** 21,31 ****
  push(@reports, "grep woc");
  push(@titles, "Complete file");
! # BELOW IS NOT WORKING PROPERLY
! #push(@reports, "grep items/");
! #push(@titles, "item/*.shtml only");
! #push(@reports, "grep cgi-bin-woc | sed -e 's/\?[^\s\"]*//g'");
! #push(@titles, "cgi-bin scripts only");
! #push(@reports, "grep translation");
! #push(@titles, "translation/ only");
  
  print "Extracting information on /woc server...$/";
--- 21,26 ----
  push(@reports, "grep woc");
  push(@titles, "Complete file");
! 
! `mkdir -p /tmp/woc`;
  
  print "Extracting information on /woc server...$/";
***************
*** 37,45 ****
    for (my $i=1; $i<=scalar(@reports); $i++) {
        print "Compiling report $WOCLOG$i.txt (with $reports[$i-1])...\n";
!       my $command = "cat $TMPLOG | $reports[$i-1] | $LIRE $LIRE2 www combined > $WOCLOG$i.txt";
        print "$command\n";
        `$command`;
        if (-r "$WOCLOG$i.txt") {
! 	  `cat $WOCLOG$i.txt | /usr/ucb/mail -s '$titel $titles[$i-1]' $EMAIL`;
        }
    }
--- 32,40 ----
    for (my $i=1; $i<=scalar(@reports); $i++) {
        print "Compiling report $WOCLOG$i.txt (with $reports[$i-1])...\n";
!       my $command = "cat $TMPLOG | $reports[$i-1] | $LIRE $LIRE2 combined > $WOCLOG$i.txt";
        print "$command\n";
        `$command`;
        if (-r "$WOCLOG$i.txt") {
!           `cat $WOCLOG$i.txt | /usr/ucb/mail -s '$titel $titles[$i-1]' $EMAIL`;
        }
    }

[Woc-commit] CVS: woc/bin/topic topic2html.pl,1.1,1.2

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

Update of /cvsroot/woc/woc/bin/topic
In directory sc8-pr-cvs1:/tmp/cvs-serv24304/topic

Modified Files:
	topic2html.pl 
Log Message:
Getting this baby started again (monday evening session)

Index: topic2html.pl
===================================================================
RCS file: /cvsroot/woc/woc/bin/topic/topic2html.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** topic2html.pl	19 Jul 2002 10:56:06 -0000	1.1
--- topic2html.pl	14 Jan 2004 13:10:52 -0000	1.2
***************
*** 195,199 ****
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 $association =~ s/\$\*\$/ <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file+$$assoc[0]\"><I>$related_topic<\/I><\/A>$delim\$\*\$/g;
                } else {
                  # don't link #
--- 195,199 ----
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 $association =~ s/\$\*\$/ <A HREF=\"\/cgi-bin\/topiclink\/link.pl?$related_file+$$assoc[0]\"><I>$related_topic<\/I><\/A>$delim\$\*\$/g;
                } else {
                  # don't link #
***************
*** 211,215 ****
                # add link #
                $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!               $association =~ s/\$$i\$/<A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic<\/I><\/A>/g;
              } else {
                # don't link #
--- 211,215 ----
                # add link #
                $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!               $association =~ s/\$$i\$/<A HREF=\"\/cgi-bin\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic<\/I><\/A>/g;
              } else {
                # don't link #
***************
*** 240,244 ****
              # add link #
              $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!             push (@result, " <A HREF=\"/cgi-bin-woc/topiclink/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
            } else {
              # don't link #
--- 240,244 ----
              # add link #
              $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!             push (@result, " <A HREF=\"/cgi-bin/topiclink/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
            } else {
              # don't link #
***************
*** 252,256 ****
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 push (@result, ", <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
                } else {
                  # don't link #
--- 252,256 ----
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 push (@result, ", <A HREF=\"\/cgi-bin\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
                } else {
                  # don't link #
***************
*** 261,265 ****
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 push (@result, " en <A HREF=\"\/cgi-bin-woc\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
                } else {
                  # don't link #
--- 261,265 ----
                  # add link #
                  $related_file =~ s/\/vol\/www\/woc\/web-docs/\/woc/i;
!                 push (@result, " en <A HREF=\"\/cgi-bin\/topiclink\/link.pl?$related_file\+$$assoc[0]\"><I>$related_topic</I></A>");
                } else {
                  # don't link #

[Woc-commit] CVS: woc configure.in,1.14,1.15

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

Update of /cvsroot/woc/woc
In directory sc8-pr-cvs1:/tmp/cvs-serv23871

Modified Files:
	configure.in 
Log Message:
Getting this baby started again (monday evening session)

Index: configure.in
===================================================================
RCS file: /cvsroot/woc/woc/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** configure.in	16 Aug 2002 15:57:49 -0000	1.14
--- configure.in	14 Jan 2004 13:08:14 -0000	1.15
***************
*** 21,25 ****
  if test -z "$SERVER_HOSTNAME"
  then
!     SERVER_HOSTNAME="www-woc.sci.kun.nl"
  fi
  AC_SUBST(SERVER_HOSTNAME)
--- 21,25 ----
  if test -z "$SERVER_HOSTNAME"
  then
!     SERVER_HOSTNAME="www.woc.sci.kun.nl"
  fi
  AC_SUBST(SERVER_HOSTNAME)
***************
*** 90,120 ****
     data/Makefile
     data/wml/Makefile
-    data/wml/a/Makefile
-    data/wml/b/Makefile
-    data/wml/c/Makefile
-    data/wml/d/Makefile
-    data/wml/e/Makefile
-    data/wml/f/Makefile
-    data/wml/g/Makefile
-    data/wml/h/Makefile
-    data/wml/i/Makefile
-    data/wml/j/Makefile
-    data/wml/k/Makefile
-    data/wml/l/Makefile
-    data/wml/m/Makefile
-    data/wml/n/Makefile
-    data/wml/o/Makefile
-    data/wml/p/Makefile
-    data/wml/q/Makefile
-    data/wml/r/Makefile
-    data/wml/s/Makefile
-    data/wml/t/Makefile
-    data/wml/u/Makefile
-    data/wml/v/Makefile
-    data/wml/w/Makefile
-    data/wml/x/Makefile
-    data/wml/y/Makefile
-    data/wml/z/Makefile
-    data/wml/123/Makefile
     data/dadml/Makefile
     data/dadml/physicalprop/Makefile
--- 90,93 ----
***************
*** 122,125 ****
--- 95,100 ----
     lib/Makefile
     lib/java/Makefile
+    lib/xml/Makefile
+    lib/xml/dtd/Makefile
     source/Makefile
     source/wocjava/Makefile

[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/util GroupAdder.java,1.1,1.2 Path.java,1.2,1.3

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

Update of /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/util
In directory sc8-pr-cvs1:/tmp/cvs-serv23738/wocjava/source/com/egonw/woc/util

Modified Files:
	GroupAdder.java Path.java 
Log Message:
Getting this baby started again (monday evening session)

Index: GroupAdder.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/util/GroupAdder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** GroupAdder.java	8 Jun 2002 20:29:03 -0000	1.1
--- GroupAdder.java	14 Jan 2004 13:07:57 -0000	1.2
***************
*** 76,80 ****
       } catch (WocNotification wn) {

         System.out.println("Unreported WocNotification");

!      } finally { return result; }

    }

  

--- 76,81 ----
       } catch (WocNotification wn) {

         System.out.println("Unreported WocNotification");

!      } finally {};

!      return result;

    }

  

***************
*** 83,87 ****
      group = Convert.GROUPLikeToNAMELike(group);

      XItem result = new XItem();

!     result.add(XItem.XFILENAME, group);
      result.add(Item.NAME, group);

      result.add(XItem.XGROUP, new String("yes"));

--- 84,88 ----
      group = Convert.GROUPLikeToNAMELike(group);

      XItem result = new XItem();

!     result.add(XItem.XFILENAME, group);

      result.add(Item.NAME, group);

      result.add(XItem.XGROUP, new String("yes"));


Index: Path.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/util/Path.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Path.java	15 Aug 2002 15:16:28 -0000	1.2
--- Path.java	14 Jan 2004 13:07:57 -0000	1.3
***************
*** 44,47 ****
--- 44,48 ----
      } catch (Exception e) {
          System.err.println("Error: " + e);
+         e.printStackTrace();
          System.exit(1);
      }

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

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

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

Modified Files:
	MaakLosseItems.java SimpleAddItem.java Woord.java 
Log Message:
Getting this baby started again (monday evening session)

Index: MaakLosseItems.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/MaakLosseItems.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MaakLosseItems.java	15 Aug 2002 12:02:07 -0000	1.2
--- MaakLosseItems.java	14 Jan 2004 13:07:57 -0000	1.3
***************
*** 23,31 ****
      private static String date = "2002-01-27";
      
      private static Path repository;
  
      public static void main(String[] args) {
  
!         String reposdeffile = "file:///vol/www/woc/bin/repository_def.xml";
          String repos = "woc";
  
--- 23,32 ----
      private static String date = "2002-01-27";
      
+     private static String path = "woc";
      private static Path repository;
  
      public static void main(String[] args) {
  
!         String reposdeffile = "file:///vol/www/woc/woc3/bin/wml2html/repository_def.xml";
          String repos = "woc";
  
***************
*** 35,42 ****
              System.out.println("Parsing arguments...");
              for (int i = 0; i < length; i++) {
!                 if ("-r".equals(args[i]) && ((i+1) < length)) {
!                     repos = args[i+1];
!                     System.out.println("  repository: " + args[i+1]);
                      i++;
                  } else if ("-R".equals(args[i]) && ((i+1) < length)) {
                      reposdeffile = args[i+1];
--- 36,43 ----
              System.out.println("Parsing arguments...");
              for (int i = 0; i < length; i++) {
!                 if (args[i].equals("-r") && ((i+1) < length)) {
                      i++;
+                     path = args[i];
+                     System.out.println("  repository: " + args[i]);
                  } else if ("-R".equals(args[i]) && ((i+1) < length)) {
                      reposdeffile = args[i+1];
***************
*** 51,55 ****
  
          // setting default repository
!         String url = "file://" + reposdeffile;
          repository = new Path(repos, url);
  
--- 52,56 ----
  
          // setting default repository
!         String url = reposdeffile;
          repository = new Path(repos, url);
  
***************
*** 70,74 ****
          DBDEFLIST dbdeflist = new DBDEFLIST();
          DBLIST dblist = new DBLIST();
!         String superXML = "http://www.sci.kun.nl/woc/super.xml";
          try {
              // System.err.println("Downloading: " + superXML);
--- 71,75 ----
          DBDEFLIST dbdeflist = new DBDEFLIST();
          DBLIST dblist = new DBLIST();
!         String superXML = "http://www.woc.sci.kun.nl/super.xml";
          try {
              // System.err.println("Downloading: " + superXML);

Index: SimpleAddItem.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/SimpleAddItem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SimpleAddItem.java	15 Aug 2002 15:16:28 -0000	1.3
--- SimpleAddItem.java	14 Jan 2004 13:07:57 -0000	1.4
***************
*** 80,84 ****
  	DBDEFLIST dbdeflist = new DBDEFLIST();
  	DBLIST dblist = new DBLIST();
! 	String superXML = "http://www.sci.kun.nl/woc/super.xml";
  	try {
  	    System.err.println("Downloading: " + superXML);
--- 80,84 ----
  	DBDEFLIST dbdeflist = new DBDEFLIST();
  	DBLIST dblist = new DBLIST();
! 	String superXML = "http://www.woc.sci.kun.nl/super.xml";
  	try {
  	    System.err.println("Downloading: " + superXML);

Index: Woord.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/tools/Woord.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Woord.java	8 Jun 2002 20:29:03 -0000	1.1
--- Woord.java	14 Jan 2004 13:07:57 -0000	1.2
***************
*** 24,28 ****
      public static void main(String[] args) {
  
!         String reposdeffile = "file:///vol/www/woc/bin/repository_def.xml";
          String repos = "woc";
  
--- 24,28 ----
      public static void main(String[] args) {
  
!         String reposdeffile = "file:///vol/www/woc/woc3/bin/wml2html/repository_def.xml";
          String repos = "woc";
  
***************
*** 48,53 ****
  
          // setting default repository
!         String url = "file://" + reposdeffile;
!         repository = new Path("woc", url);
  
  	WocEngine we = new WocEngine(repository);
--- 48,53 ----
  
          // setting default repository
!         String url = reposdeffile;
!         repository = new Path(repos, url);
  
  	WocEngine we = new WocEngine(repository);
***************
*** 86,89 ****
--- 86,90 ----
  	} catch (Exception e) {
  	    System.out.println("Error: " + e);
+         e.printStackTrace();
  	}
      }

[Woc-commit] CVS: woc/source/wocjava/source/com/egonw/woc/files ItemFile.java,1.1,1.2 WocListReadFile.java,1.1,1.2

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

Update of /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/files
In directory sc8-pr-cvs1:/tmp/cvs-serv23738/wocjava/source/com/egonw/woc/files

Modified Files:
	ItemFile.java WocListReadFile.java 
Log Message:
Getting this baby started again (monday evening session)

Index: ItemFile.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/files/ItemFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ItemFile.java	8 Jun 2002 20:29:02 -0000	1.1
--- ItemFile.java	14 Jan 2004 13:07:57 -0000	1.2
***************
*** 124,128 ****
      writeLine("<img src=\"http://www.sitemeter.com/meter.asp?site=woccounter\" alt=\"Site Meter\" nosave border=0></a>");
      writeLine("</noscript>");
!     writeLine("<script>document.write(\"//\"+\"-\"+\"-\"+\">\");</script>");
      writeLine("<!-- Copyright 1999 Site Meter -->");
      writeLine("<!--WEBBOT bot=\"HTMLMarkup\" Endspan -->");
--- 124,128 ----
      writeLine("<img src=\"http://www.sitemeter.com/meter.asp?site=woccounter\" alt=\"Site Meter\" nosave border=0></a>");
      writeLine("</noscript>");
!     writeLine("<!-- script>document.write(\"//\"+\"-\"+\"-\"+\">\");</script -->");
      writeLine("<!-- Copyright 1999 Site Meter -->");
      writeLine("<!--WEBBOT bot=\"HTMLMarkup\" Endspan -->");
***************
*** 669,673 ****
        } else {
  	  // Oud mechanism, gebruik makend van SSI
! 	  write("<p><!--#include virtual=\"/cgi-bin-woc/ssi/dadml.pl?");
  	  write("CAS-NUMBER+" + (String)i.get(Item.CASNR));
  	  if (i.contains(XItem.XENR)) {
--- 669,673 ----
        } else {
  	  // Oud mechanism, gebruik makend van SSI
! 	  write("<p><!--#include virtual=\"" + repository.getCgiBinRoot() + "/ssi/dadml.pl?");
  	  write("CAS-NUMBER+" + (String)i.get(Item.CASNR));
  	  if (i.contains(XItem.XENR)) {
***************
*** 690,694 ****
        writeLine("<td colspan=3 align=left valign=top>");
        writeLine("<b>Samenhang</b>:<br><ul>");
!       write("<!--#include virtual=\"/cgi-bin-woc/ssi/topicmap.pl?");
        write((String)i.get(XItem.ANCHOR));
        writeLine(".xml\"-->");
--- 690,694 ----
        writeLine("<td colspan=3 align=left valign=top>");
        writeLine("<b>Samenhang</b>:<br><ul>");
!       write("<!--#include virtual=\"" + repository.getCgiBinRoot() + "/ssi/topicmap.pl?");
        write((String)i.get(XItem.ANCHOR));
        writeLine(".xml\"-->");

Index: WocListReadFile.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/files/WocListReadFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WocListReadFile.java	8 Jun 2002 20:29:02 -0000	1.1
--- WocListReadFile.java	14 Jan 2004 13:07:57 -0000	1.2
***************
*** 85,88 ****
--- 85,89 ----
                      System.out.println("Error during parsing of XInsert:");
                      System.out.println(e.toString());
+                     e.printStackTrace();
                    }
  		  i = ((CMLHandler)handler).updateItem(i);

[Woc-commit] CVS: woc/source/wocjava repository_def.xml.in,1.3,1.4

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

Update of /cvsroot/woc/woc/source/wocjava
In directory sc8-pr-cvs1:/tmp/cvs-serv23738/wocjava

Modified Files:
	repository_def.xml.in 
Log Message:
Getting this baby started again (monday evening session)

Index: repository_def.xml.in
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/repository_def.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** repository_def.xml.in	16 Aug 2002 15:16:59 -0000	1.3
--- repository_def.xml.in	14 Jan 2004 13:07:57 -0000	1.4
***************
*** 14,18 ****
      <!-- website -->
      <path id="HtmlRoot">http://@SERVER_HOSTNAME@/</path>
!     <path id="CgiBinRoot">http://@SERVER_HOSTNAME@/cgi-bin/</path>
      <path id="JavaSubDir">java/</path>
      <!-- other -->
--- 14,18 ----
      <!-- website -->
      <path id="HtmlRoot">http://@SERVER_HOSTNAME@/</path>
!     <path id="CgiBinRoot">/cgi-bin/</path>
      <path id="JavaSubDir">java/</path>
      <!-- other -->

[Woc-commit] CVS: woc/data/wml splitwoclist.pl,NONE,1.1 syncwoclist.pl,NONE,1.1 woclist.pl,NONE,1.1 woclist.sh,NONE,1.1 woclist.xml,NONE,1.1 .cvsignore,1.1,1.2 install_source,1.1,NONE

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

Update of /cvsroot/woc/woc/data/wml
In directory sc8-pr-cvs1:/tmp/cvs-serv22668

Modified Files:
	.cvsignore 
Added Files:
	splitwoclist.pl syncwoclist.pl woclist.pl woclist.sh 
	woclist.xml 
Removed Files:
	install_source 
Log Message:
Added woclist: a single file wml source

--- NEW FILE: splitwoclist.pl ---
#! /usr/bin/perl
use strict;
use diagnostics;

# Author: Geert Josten

# hulp-script gebruikt door wocml.sh

my $infile;
my $outdir;
my $outfile;

if (@ARGV >= 2) {
  $infile = shift;
  $outdir = shift;
} else {
  $infile = "woclist.xml";
  $outdir = "tmp/";
}

open (INFILE, "$infile");

my $inheader = 1;
my $fileisopen = 0;
my $incml = 0;
my $header = "";

while (<INFILE>) {
  my $file;
  if (/DOCTYPE woclist/i) {
    s#<!DOCTYPE woclist.*>#<!DOCTYPE ITEM PUBLIC \"-//www-woc.sci.kun.nl//DTD WOC Markup Language V1.0//EN\" \"http://www-woc.sci.kun.nl/wocml.dtd\">#i;
    $header .= $_;
  } elsif (/<woclist/i) {
    $inheader = 0;
    $fileisopen = 0;
  } elsif (/<ITEM.*?FILE=\"(.*?)\"/i) {
#    print OUTFILE "\n" if $fileisopen;
    my $outfile = $outdir.$1.".xml";
    s/FILE/CODE/i;
    if (open (OUTFILE, ">$outfile")) {
       $fileisopen = 1;
       print OUTFILE $header;
       print OUTFILE;
    } else {
       warn "Cannot write to file $outfile!\n";
       $fileisopen = 0;
    }
    $inheader = 0;
  } elsif (/<\/woclist/i) {
  } elsif (/(.*?)<!-- \[(INSERT.*?)\](.*?)\[(\/INSERT)\] -->(.*)/i) {
    print OUTFILE "$1<$2>$3<$4>$5\n";
    $incml = 1;
  } elsif (/<\/molecule/i) {
    $incml = 0;
  } elsif ($inheader) {
    $header .= $_
  } else {
    print OUTFILE if $fileisopen && ! $incml;
  }
}

# zoals in Convert.java
sub NAMELikeToANCHORLike {
 # heeft 1 parameter
 my $param = shift @_;

 $param =~ s/^\s*(.*?)\s*$/$1/ig;
 $param =~ s/\ /\_/g;
 $param =~ s/[,|.|<|>]//g;
 $param =~ tr/[A-Z]/[a-z]/;

 return $param;
}

--- NEW FILE: syncwoclist.pl ---
#! /usr/bin/perl

use strict;

use diagnostics;



# Author: Geert Josten



# hulp-script gebruikt door wocml.sh



my $newdir;

my $orgdir;



if (@ARGV >= 2) {

  $newdir = shift;

  $orgdir = shift;

} else {

  $newdir = "tmp/";

  $orgdir = "../../../../share/woc/data/wml/";

}



my @newfiles = glob $newdir."*.xml";



foreach my $newfile (@newfiles) {

   my $orgfile = $newfile;

   $orgfile =~ s/^$newdir//;

   my $subdir = (substr $orgfile, 0, 1)."/";

   $subdir =~ s/[0-9]/123/;

   $orgfile = $orgdir.$subdir.$orgfile;

   if (-s $orgfile) {

      my $diff = `diff $newfile $orgfile`;

      if ($diff) {

         warn "Original file different from $newfile!\n";

      }

   } else {

      warn "Original file $orgfile of $newfile not found!\n";

   }

}


--- NEW FILE: woclist.pl ---
#! /usr/bin/perl
use strict;
use diagnostics;

# Author: Geert Josten

# hulp-script gebruikt door wocml.sh

#my $cmldir="../../data/dadml/physicalprop/cml";
my $cmldir="../../../../share/woc/data/dadml/physicalprop/cml";
my $infile;
my $outfile;

if (@ARGV >= 2) {
  $infile = shift;
  $outfile = shift;
} else {
  $infile = "woclist.tmp2.xml";
  $outfile = "woclist.xml";
}

open (INFILE, "$infile");
open (OUTFILE, ">$outfile");

#print eerste regel alvast
$_ = <INFILE>; print OUTFILE;

while (<INFILE>) {
  my $file;
  if (/ITEM.*?CODE=/i) {
    s/CODE/FILE/i;
    print OUTFILE;
  } elsif (/INSERT.*PhysicalProperties.*>(.*)</i) {
    my @inserts = `awk '/<molecule/,/<\\/molecule/{print " ",\$0}' $cmldir/$1`;
    s/<(INSERT.*?)>(.*?)<\/INSERT>/<!-- \[$1\]$2\[\/INSERT\] -->/i;
    print OUTFILE;
    foreach my $insert (@inserts) {
      if ($insert =~ /^(.*Stoichiometry.*>)(.*)(<.*)$/i) {
        my $pre = $1;
        my $bruto = $2;
        my $brutoID = $2;
        my $post = $3;
        $bruto =~ s/(\d+)/<sub>$1<\/sub>/ig;
        print OUTFILE $pre,$bruto,$post,$/;
        $pre =~ s/Stoichiometry/StoichiometryID/i;
        $brutoID =~ s/(\d+)/{$1}/ig;
        while ($brutoID =~ /\{(\d+?)\}/) {
          my $number = sprintf "%04i", $1;
          $brutoID =~ s/\{\d+?\}/$number/;
        }
        print OUTFILE $pre,$brutoID,$post,$/;
      } else {
        print OUTFILE $insert;
      }
    }
  } elsif (/\<\?xml.*\?\>/i) {
    s/\<\?xml.*\?\>//i;
    print OUTFILE;
  } else {
    print OUTFILE;
  }
}

# zoals in Convert.java
sub NAMELikeToANCHORLike {
 # heeft 1 parameter
 my $param = shift @_;

 $param =~ s/^\s*(.*?)\s*$/$1/ig;
 $param =~ s/\ /\_/g;
 $param =~ s/[,|.|<|>]//g;
 $param =~ tr/[A-Z]/[a-z]/;

 return $param;
}

--- NEW FILE: woclist.sh ---
#! /usr/bin/sh -e

# Author: Geert Josten

NAME="woclist"
EXT=".xml"
TEMP=".tmp"
TEMP2=".tmp2"
#WMLDIR="../../data/wml"
WMLDIR="../../../../share/woc/data/wml"

# cmldir is in perl-stukje gedefinieerd

echo "" > $NAME$TEMP
cat `find $WMLDIR/123 -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/a -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/b -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/c -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/d -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/e -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/f -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/g -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/h -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/i -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/j -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/k -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/l -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/m -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/n -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/o -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/p -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/q -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/r -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/s -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/t -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/u -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/v -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/w -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/x -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/y -name "*.xml" | grep -v templates` >> $NAME$TEMP
cat `find $WMLDIR/z -name "*.xml" | grep -v templates` >> $NAME$TEMP

echo '<?xml version="1.0" encoding="ISO-8859-1"?>' > $NAME$TEMP2
echo '<!DOCTYPE '$NAME' SYSTEM "../../lib/xml/dtd/'$NAME'.dtd">' >> $NAME$TEMP2
echo '<'$NAME' xmlns:xsl="http://www.w3.org/1999/XSL/Transform"' >> $NAME$TEMP2
echo '         xmlns:import="http://www.sci.kun.nl/woc/import"' >> $NAME$TEMP2
echo '         xmlns:xlink="http://www.sci.kun.nl/woc/topicmap">' >> $NAME$TEMP2
awk "/<ITEM/,/<\/ITEM/{print}" $NAME$TEMP >> $NAME$TEMP2
echo '</'$NAME'>' >> $NAME$TEMP2

/usr/bin/perl $NAME.pl $NAME$TEMP2 $NAME$EXT

rm $NAME$TEMP $NAME$TEMP2
# chgrp wwwwoc $NAME$EXT
chmod 664 $NAME$EXT

--- NEW FILE: woclist.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE woclist SYSTEM "../../lib/xml/dtd/woclist.dtd">
<woclist xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         xmlns:import="http://www.sci.kun.nl/woc/import"
         xmlns:xlink="http://www.sci.kun.nl/woc/topicmap">
<ITEM NAME="1,1,1-trichloorethaan" ID="WOC00001542" CLASS="CHEMICAL" FILE="111trichloorethaan">
  <DICT>
    <NAME CLASS="IUPAC">
      <LANG ID="EN">1,1,1-trichloorethane</LANG>
      <LANG ID="NL">1,1,1-trichloorethaan</LANG>
    </NAME>
    <NAME CLASS="TRIVIAL">
      <LANG ID="EN">methylchloroform</LANG>
    </NAME>
  </DICT>
  <INDEX CLASS="CAS-NUMBER">25323-89-1</INDEX>
  <GROUP>oplosmiddelen</GROUP>
</ITEM>
<ITEM NAME="1,11-difenylcyclopropaan" CLASS="CHEMICAL" ID="WOC00000001" FILE="11difenylcyclopropaan">
[...38534 lines suppressed...]
    <NAME CLASS="TRIVIAL">
      <LANG ID="NL">zwitterion</LANG>
      <LANG ID="EN">zwitterion</LANG>
      <LANG ID="FR">zwitterion</LANG>
    </NAME>
  </DICT>
  <WOC>
    <COMMENT>
      <p>Een zwitterion heeft zowel een positieve als negatieve lading.
        Moleculen met een zure en een basische groep zijn bij een bepaalde
        pH zwitterion. Het
        ion kan gevormd worden door een interne zuur-base reaktie. Een
        aminozuur is een voorbeeld van een zwitterion.</p>
    </COMMENT>
    <tm:topicmap xmlns:tm="http://www.topic-maps.de/content/resources\tm.dtd"
                 xmlns:woctm="http://www.sci.kun.nl/woc/woctm">
    </tm:topicmap>
  </WOC>
</ITEM>
</woclist>

Index: .cvsignore
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore	15 Aug 2002 15:16:24 -0000	1.1
--- .cvsignore	14 Jan 2004 13:01:56 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
  Makefile
  Makefile.in
+ tmp

--- install_source DELETED ---

[Woc-commit] CVS: woc/data/wml Makefile.am,1.2,1.3 catalog,1.1,NONE mkwml,1.2,NONE validate_source,1.3,NONE

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

Update of /cvsroot/woc/woc/data/wml
In directory sc8-pr-cvs1:/tmp/cvs-serv20089

Modified Files:
	Makefile.am 
Removed Files:
	catalog mkwml validate_source 
Log Message:
Removed individual source files from CVS

Index: Makefile.am
===================================================================
RCS file: /cvsroot/woc/woc/data/wml/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	16 Aug 2002 14:23:44 -0000	1.2
--- Makefile.am	14 Jan 2004 12:49:49 -0000	1.3
***************
*** 1,4 ****
  CLEANFILES=
  
! SUBDIRS= a b c d e f g h i j k l m \
!          n o p q r s t u v w x y z 123
--- 1,3 ----
  CLEANFILES=
  
! SUBDIRS=

--- catalog DELETED ---

--- mkwml DELETED ---

--- validate_source DELETED ---

[Woc-commit] CVS: woc/data/wml/y yl.xml,1.2,NONE ynbinding.xml,1.2,NONE

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

Update of /cvsroot/woc/woc/data/wml/y
In directory sc8-pr-cvs1:/tmp/cvs-serv20089/y

Removed Files:
	yl.xml ynbinding.xml 
Log Message:
Removed individual source files from CVS

--- yl.xml DELETED ---

--- ynbinding.xml DELETED ---

[Woc-commit] CVS: woc/data/wml/t tamoxifen.xml,1.2,NONE tartrazine.xml,1.2,NONE tautomeren.xml,1.2,NONE taxol.xml,1.2,NONE tbutylalcohol.xml,1.2,NONE tbutylcyclohexaan.xml,1.2,NONE tcdd.xml,1.2,NONE tcdf.xml,1.2,NONE terefthaalzuur.xml,1.2,NONE terfenyl.xml,1.2,NONE ternaire_verbinding.xml,1.2,NONE terpeen.xml,1.2,NONE terpenen.xml,1.2,NONE terpentine.xml,1.2,NONE terpinoleen.xml,1.2,NONE terpyridine.xml,1.2,NONE tertbutylchloride.xml,1.2,NONE tertiar_bicyclisch_koolstofatoom.xml,1.2,NONE tesla.xml,1.2,NONE testosteron.xml,1.2,NONE tetrachlooretheen.xml,1.2,NONE tetrachloromethaan.xml,1.2,NONE tetracyclopropylmethaan.xml,1.2,NONE tetradecaan.xml,1.2,NONE tetradecaanzuur.xml,1.2,NONE tetraedrisch.xml,1.2,NONE tetraethyllood.xml,1.2,NONE tetrafenylcyclopentadienon.xml,1.2,NONE tetrafluoretheen.xml,1.2,NONE tetrahydrocannabinol.xml,1.2,NONE tetrahydrofuran.xml,1.2,NONE tetrahydroindeen.xml,1.2,NONE tetramethylureum.xml,1.2,NONE tetrose.xml,1.2,NONE theobromine.xml,1.2,NONE theophylline.xml,1.2,NONE thermoharder.xml,1.2,NONE thermolyse.xml,1.2,NONE thermoplast.xml,1.2,NONE thermotropevloeibarekristal.xml,1.2,NONE thioeters.xml,1.2,NONE thiofeen.xml,1.2,NONE thiofosgeen.xml,1.2,NONE thioketonen.xml,1.2,NONE thiol.xml,1.2,NONE thionylchloride.xml,1.2,NONE thiopropionaldehydesoxide.xml,1.2,NONE thioureum.xml,1.2,NONE thymine.xml,1.2,NONE thymol.xml,1.2,NONE thymolblauw.xml,1.2,NONE tibolon.xml,1.2,NONE tiffeneaudemyanovreactie.xml,1.2,NONE tin.xml,1.2,NONE tms-.xml,1.2,NONE tms.xml,1.2,NONE tolueen.xml,1.2,NONE toluidine.xml,1.2,NONE tosylgroep.xml,1.2,NONE toxischequivalent.xml,1.2,NONE traangas.xml,1.2,NONE trans12dichlorocyclopropaan.xml,1.2,NONE trans2buteen.xml,1.2,NONE transconfiguratie.xml,1.2,NONE trechter.xml,1.2,NONE treonine.xml,1.2,NONE tri.xml,1.2,NONE triazine.xml,1.2,NONE tributyltin.xml,1.2,NONE trichloorethaan.xml,1.2,NONE trichloorfluormethaan.xml,1.2,NONE trichloroazijnzuur.xml,1.2,NONE trichlorofenol.xml,1.2,NONE triclosan.xml,1.2,NONE tridecaan.xml,1.2,NONE triethoxyfosfine.xml,1.2,NONE triethylamine.xml,1.2,NONE triethyleenglycol.xml,1.2,NONE triethylfosfonoacetaat.xml,1.2,NONE trifenylfosfine.xml,1.2,NONE trifenylmethanol.xml,1.2,NONE trifylgroep.xml,1.2,NONE triglyceriden.xml,1.2,NONE trimethylamine.xml,1.2,NONE trimethylsilylchloride.xml,1.2,NONE trimethylsilyloxycyclohexeen.xml,1.2,NONE trimyristine.xml,1.2,NONE trinitrobenzeen.xml,1.2,NONE trinitrotolueen.xml,1.2,NONE triol.xml,1.2,NONE trioleine.xml,1.2,NONE triose.xml,1.2,NONE trioxaan.xml,1.2,NONE tripalmitine.xml,1.2,NONE tristearine.xml,1.2,NONE tritylbromide.xml,1.2,NONE tritylchloride.xml,1.2,NONE trogersbase.xml,1.2,NONE tryptofaan.xml,1.2,NONE tsuchihashisynthese.xml,1.2,NONE twaron.xml,1.2,NONE twistconformatie.xml,1.2,NONE typeisomerie.xml,1.2,NONE tyrosine.xml,1.2,NONE

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

Update of /cvsroot/woc/woc/data/wml/t
In directory sc8-pr-cvs1:/tmp/cvs-serv20089/t

Removed Files:
	tamoxifen.xml tartrazine.xml tautomeren.xml taxol.xml 
	tbutylalcohol.xml tbutylcyclohexaan.xml tcdd.xml tcdf.xml 
	terefthaalzuur.xml terfenyl.xml ternaire_verbinding.xml 
	terpeen.xml terpenen.xml terpentine.xml terpinoleen.xml 
	terpyridine.xml tertbutylchloride.xml 
	tertiar_bicyclisch_koolstofatoom.xml tesla.xml testosteron.xml 
	tetrachlooretheen.xml tetrachloromethaan.xml 
	tetracyclopropylmethaan.xml tetradecaan.xml 
	tetradecaanzuur.xml tetraedrisch.xml tetraethyllood.xml 
	tetrafenylcyclopentadienon.xml tetrafluoretheen.xml 
	tetrahydrocannabinol.xml tetrahydrofuran.xml 
	tetrahydroindeen.xml tetramethylureum.xml tetrose.xml 
	theobromine.xml theophylline.xml thermoharder.xml 
	thermolyse.xml thermoplast.xml thermotropevloeibarekristal.xml 
	thioeters.xml thiofeen.xml thiofosgeen.xml thioketonen.xml 
	thiol.xml thionylchloride.xml thiopropionaldehydesoxide.xml 
	thioureum.xml thymine.xml thymol.xml thymolblauw.xml 
	tibolon.xml tiffeneaudemyanovreactie.xml tin.xml tms-.xml 
	tms.xml tolueen.xml toluidine.xml tosylgroep.xml 
	toxischequivalent.xml traangas.xml 
	trans12dichlorocyclopropaan.xml trans2buteen.xml 
	transconfiguratie.xml trechter.xml treonine.xml tri.xml 
	triazine.xml tributyltin.xml trichloorethaan.xml 
	trichloorfluormethaan.xml trichloroazijnzuur.xml 
	trichlorofenol.xml triclosan.xml tridecaan.xml 
	triethoxyfosfine.xml triethylamine.xml triethyleenglycol.xml 
	triethylfosfonoacetaat.xml trifenylfosfine.xml 
	trifenylmethanol.xml trifylgroep.xml triglyceriden.xml 
	trimethylamine.xml trimethylsilylchloride.xml 
	trimethylsilyloxycyclohexeen.xml trimyristine.xml 
	trinitrobenzeen.xml trinitrotolueen.xml triol.xml 
	trioleine.xml triose.xml trioxaan.xml tripalmitine.xml 
	tristearine.xml tritylbromide.xml tritylchloride.xml 
	trogersbase.xml tryptofaan.xml tsuchihashisynthese.xml 
	twaron.xml twistconformatie.xml typeisomerie.xml tyrosine.xml 
Log Message:
Removed individual source files from CVS

--- tamoxifen.xml DELETED ---

--- tartrazine.xml DELETED ---

--- tautomeren.xml DELETED ---

--- taxol.xml DELETED ---

--- tbutylalcohol.xml DELETED ---

--- tbutylcyclohexaan.xml DELETED ---

--- tcdd.xml DELETED ---

--- tcdf.xml DELETED ---

--- terefthaalzuur.xml DELETED ---

--- terfenyl.xml DELETED ---

--- ternaire_verbinding.xml DELETED ---

--- terpeen.xml DELETED ---

--- terpenen.xml DELETED ---

--- terpentine.xml DELETED ---

--- terpinoleen.xml DELETED ---

--- terpyridine.xml DELETED ---

--- tertbutylchloride.xml DELETED ---

--- tertiar_bicyclisch_koolstofatoom.xml DELETED ---

--- tesla.xml DELETED ---

--- testosteron.xml DELETED ---

--- tetrachlooretheen.xml DELETED ---

--- tetrachloromethaan.xml DELETED ---

--- tetracyclopropylmethaan.xml DELETED ---

--- tetradecaan.xml DELETED ---

--- tetradecaanzuur.xml DELETED ---

--- tetraedrisch.xml DELETED ---

--- tetraethyllood.xml DELETED ---

--- tetrafenylcyclopentadienon.xml DELETED ---

--- tetrafluoretheen.xml DELETED ---

--- tetrahydrocannabinol.xml DELETED ---

--- tetrahydrofuran.xml DELETED ---

--- tetrahydroindeen.xml DELETED ---

--- tetramethylureum.xml DELETED ---

--- tetrose.xml DELETED ---

--- theobromine.xml DELETED ---

--- theophylline.xml DELETED ---

--- thermoharder.xml DELETED ---

--- thermolyse.xml DELETED ---

--- thermoplast.xml DELETED ---

--- thermotropevloeibarekristal.xml DELETED ---

--- thioeters.xml DELETED ---

--- thiofeen.xml DELETED ---

--- thiofosgeen.xml DELETED ---

--- thioketonen.xml DELETED ---

--- thiol.xml DELETED ---

--- thionylchloride.xml DELETED ---

--- thiopropionaldehydesoxide.xml DELETED ---

--- thioureum.xml DELETED ---

--- thymine.xml DELETED ---

--- thymol.xml DELETED ---

--- thymolblauw.xml DELETED ---

--- tibolon.xml DELETED ---

--- tiffeneaudemyanovreactie.xml DELETED ---

--- tin.xml DELETED ---

--- tms-.xml DELETED ---

--- tms.xml DELETED ---

--- tolueen.xml DELETED ---

--- toluidine.xml DELETED ---

--- tosylgroep.xml DELETED ---

--- toxischequivalent.xml DELETED ---

--- traangas.xml DELETED ---

--- trans12dichlorocyclopropaan.xml DELETED ---

--- trans2buteen.xml DELETED ---

--- transconfiguratie.xml DELETED ---

--- trechter.xml DELETED ---

--- treonine.xml DELETED ---

--- tri.xml DELETED ---

--- triazine.xml DELETED ---

--- tributyltin.xml DELETED ---

--- trichloorethaan.xml DELETED ---

--- trichloorfluormethaan.xml DELETED ---

--- trichloroazijnzuur.xml DELETED ---

--- trichlorofenol.xml DELETED ---

--- triclosan.xml DELETED ---

--- tridecaan.xml DELETED ---

--- triethoxyfosfine.xml DELETED ---

--- triethylamine.xml DELETED ---

--- triethyleenglycol.xml DELETED ---

--- triethylfosfonoacetaat.xml DELETED ---

--- trifenylfosfine.xml DELETED ---

--- trifenylmethanol.xml DELETED ---

--- trifylgroep.xml DELETED ---

--- triglyceriden.xml DELETED ---

--- trimethylamine.xml DELETED ---

--- trimethylsilylchloride.xml DELETED ---

--- trimethylsilyloxycyclohexeen.xml DELETED ---

--- trimyristine.xml DELETED ---

--- trinitrobenzeen.xml DELETED ---

--- trinitrotolueen.xml DELETED ---

--- triol.xml DELETED ---

--- trioleine.xml DELETED ---

--- triose.xml DELETED ---

--- trioxaan.xml DELETED ---

--- tripalmitine.xml DELETED ---

--- tristearine.xml DELETED ---

--- tritylbromide.xml DELETED ---

--- tritylchloride.xml DELETED ---

--- trogersbase.xml DELETED ---

--- tryptofaan.xml DELETED ---

--- tsuchihashisynthese.xml DELETED ---

--- twaron.xml DELETED ---

--- twistconformatie.xml DELETED ---

--- typeisomerie.xml DELETED ---

--- tyrosine.xml DELETED ---

[Woc-commit] CVS: woc/data/wml/x xanthaangom.xml,1.2,NONE xanthine.xml,1.2,NONE xanthone.xml,1.2,NONE xeon.xml,1.2,NONE xtc.xml,1.2,NONE xyleen.xml,1.2,NONE xylenol.xml,1.2,NONE xylitol.xml,1.2,NONE xylometazoline.xml,1.2,NONE xylose.xml,1.2,NONE

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

Update of /cvsroot/woc/woc/data/wml/x
In directory sc8-pr-cvs1:/tmp/cvs-serv20089/x

Removed Files:
	xanthaangom.xml xanthine.xml xanthone.xml xeon.xml xtc.xml 
	xyleen.xml xylenol.xml xylitol.xml xylometazoline.xml 
	xylose.xml 
Log Message:
Removed individual source files from CVS

--- xanthaangom.xml DELETED ---

--- xanthine.xml DELETED ---

--- xanthone.xml DELETED ---

--- xeon.xml DELETED ---

--- xtc.xml DELETED ---

--- xyleen.xml DELETED ---

--- xylenol.xml DELETED ---

--- xylitol.xml DELETED ---

--- xylometazoline.xml DELETED ---

--- xylose.xml DELETED ---

[Woc-commit] CVS: woc/data/wml/w wackersynthese.xml,1.2,NONE wagnermeerweinomleggin.xml,1.2,NONE wasbenzine.xml,1.2,NONE wassen.xml,1.2,NONE waszuren.xml,1.2,NONE water.xml,1.2,NONE wateroplosbarevitaminen.xml,1.2,NONE waterstof.xml,1.2,NONE waterstofbrug.xml,1.2,NONE waterstofcarbonaat.xml,1.2,NONE waterstoffluoride.xml,1.2,NONE waterstofoxalaat.xml,1.2,NONE waterstofperoxide.xml,1.2,NONE wijnsteenzuur.xml,1.2,NONE wilkinsonscatalyst.xml,1.2,NONE williamsonsynthese.xml,1.2,NONE wittigreactie.xml,1.2,NONE wolffkishnerreductie.xml,1.2,NONE wolffomlegging.xml,1.2,NONE woskressensky_alexander.xml,1.2,NONE wurtzsynthese.xml,1.2,NONE

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

Update of /cvsroot/woc/woc/data/wml/w
In directory sc8-pr-cvs1:/tmp/cvs-serv20089/w

Removed Files:
	wackersynthese.xml wagnermeerweinomleggin.xml wasbenzine.xml 
	wassen.xml waszuren.xml water.xml wateroplosbarevitaminen.xml 
	waterstof.xml waterstofbrug.xml waterstofcarbonaat.xml 
	waterstoffluoride.xml waterstofoxalaat.xml 
	waterstofperoxide.xml wijnsteenzuur.xml wilkinsonscatalyst.xml 
	williamsonsynthese.xml wittigreactie.xml 
	wolffkishnerreductie.xml wolffomlegging.xml 
	woskressensky_alexander.xml wurtzsynthese.xml 
Log Message:
Removed individual source files from CVS

--- wackersynthese.xml DELETED ---

--- wagnermeerweinomleggin.xml DELETED ---

--- wasbenzine.xml DELETED ---

--- wassen.xml DELETED ---

--- waszuren.xml DELETED ---

--- water.xml DELETED ---

--- wateroplosbarevitaminen.xml DELETED ---

--- waterstof.xml DELETED ---

--- waterstofbrug.xml DELETED ---

--- waterstofcarbonaat.xml DELETED ---

--- waterstoffluoride.xml DELETED ---

--- waterstofoxalaat.xml DELETED ---

--- waterstofperoxide.xml DELETED ---

--- wijnsteenzuur.xml DELETED ---

--- wilkinsonscatalyst.xml DELETED ---

--- williamsonsynthese.xml DELETED ---

--- wittigreactie.xml DELETED ---

--- wolffkishnerreductie.xml DELETED ---

--- wolffomlegging.xml DELETED ---

--- woskressensky_alexander.xml DELETED ---

--- wurtzsynthese.xml DELETED ---

[Woc-commit] CVS: woc/data/wml/z z_stilbeen.xml,1.2,NONE zachtheid.xml,1.2,NONE zaitsev_regel_van.xml,1.2,NONE zeep.xml,1.2,NONE zeiselreactie.xml,1.2,NONE zelfcondensatie.xml,1.2,NONE zeoliet.xml,1.2,NONE zetmeel.xml,1.2,NONE ziegleralkylering.xml,1.2,NONE zieglernattaproces.xml,1.2,NONE zieglerpolymerisatie.xml,1.2,NONE zijketen.xml,1.2,NONE zilver.xml,1.2,NONE zink.xml,1.2,NONE zoetstoffen.xml,1.2,NONE zout.xml,1.2,NONE zoutzuur.xml,1.2,NONE zschaal_van_kosower.xml,1.2,NONE zuiverheid.xml,1.2,NONE zuiveringszout.xml,1.2,NONE zuur.xml,1.2,NONE zuur_base_titratie.xml,1.2,NONE zuuranhydride.xml,1.2,NONE zuurbaseindicatoren.xml,1.2,NONE zuurgraad.xml,1.2,NONE zuurhalogenide.xml,1.2,NONE zuursterkte.xml,1.2,NONE zuurstof.xml,1.2,NONE zwaar_water.xml,1.2,NONE zwak_zuur.xml,1.2,NONE zwavel.xml,1.2,NONE zwavelacht.xml,1.2,NONE zwavelbrug.xml,1.2,NONE zwaveldioxide.xml,1.2,NONE zwavelkoolstof.xml,1.2,NONE zwavelwaterstof.xml,1.2,NONE zwavelzuur.xml,1.2,NONE zwitterion.xml,1.2,NONE

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

Update of /cvsroot/woc/woc/data/wml/z
In directory sc8-pr-cvs1:/tmp/cvs-serv20089/z

Removed Files:
	z_stilbeen.xml zachtheid.xml zaitsev_regel_van.xml zeep.xml 
	zeiselreactie.xml zelfcondensatie.xml zeoliet.xml zetmeel.xml 
	ziegleralkylering.xml zieglernattaproces.xml 
	zieglerpolymerisatie.xml zijketen.xml zilver.xml zink.xml 
	zoetstoffen.xml zout.xml zoutzuur.xml zschaal_van_kosower.xml 
	zuiverheid.xml zuiveringszout.xml zuur.xml 
	zuur_base_titratie.xml zuuranhydride.xml 
	zuurbaseindicatoren.xml zuurgraad.xml zuurhalogenide.xml 
	zuursterkte.xml zuurstof.xml zwaar_water.xml zwak_zuur.xml 
	zwavel.xml zwavelacht.xml zwavelbrug.xml zwaveldioxide.xml 
	zwavelkoolstof.xml zwavelwaterstof.xml zwavelzuur.xml 
	zwitterion.xml 
Log Message:
Removed individual source files from CVS

--- z_stilbeen.xml DELETED ---

--- zachtheid.xml DELETED ---

--- zaitsev_regel_van.xml DELETED ---

--- zeep.xml DELETED ---

--- zeiselreactie.xml DELETED ---

--- zelfcondensatie.xml DELETED ---

--- zeoliet.xml DELETED ---

--- zetmeel.xml DELETED ---

--- ziegleralkylering.xml DELETED ---

--- zieglernattaproces.xml DELETED ---

--- zieglerpolymerisatie.xml DELETED ---

--- zijketen.xml DELETED ---

--- zilver.xml DELETED ---

--- zink.xml DELETED ---

--- zoetstoffen.xml DELETED ---

--- zout.xml DELETED ---

--- zoutzuur.xml DELETED ---

--- zschaal_van_kosower.xml DELETED ---

--- zuiverheid.xml DELETED ---

--- zuiveringszout.xml DELETED ---

--- zuur.xml DELETED ---

--- zuur_base_titratie.xml DELETED ---

--- zuuranhydride.xml DELETED ---

--- zuurbaseindicatoren.xml DELETED ---

--- zuurgraad.xml DELETED ---

--- zuurhalogenide.xml DELETED ---

--- zuursterkte.xml DELETED ---

--- zuurstof.xml DELETED ---

--- zwaar_water.xml DELETED ---

--- zwak_zuur.xml DELETED ---

--- zwavel.xml DELETED ---

--- zwavelacht.xml DELETED ---

--- zwavelbrug.xml DELETED ---

--- zwaveldioxide.xml DELETED ---

--- zwavelkoolstof.xml DELETED ---

--- zwavelwaterstof.xml DELETED ---

--- zwavelzuur.xml DELETED ---

--- zwitterion.xml DELETED ---