[Woc-commit] CVS: dadml/src/org/openscience/dadml/handlers DBDATAHandler.java,1.1.1.1,1.2 DBDEFHandler.java,1.1.1.1,1.2 DBLISTHandler.java,1.1.1.1,1.2

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

Update of /cvsroot/woc/dadml/src/org/openscience/dadml/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30994/src/org/openscience/dadml/handlers

Modified Files:
	DBDATAHandler.java DBDEFHandler.java DBLISTHandler.java 
Log Message:
Fixed endElement API and added some debug info

Index: DBDATAHandler.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/handlers/DBDATAHandler.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBDATAHandler.java	21 Mar 2004 14:47:11 -0000	1.1.1.1
--- DBDATAHandler.java	21 Mar 2004 18:56:31 -0000	1.2
***************
*** 33,36 ****
--- 33,38 ----
                      CurrentField.setMIMETYPE(atts.getValue(i));
              }
+         } else {
+             System.out.println("Unkown DADML element: " + name);
          }
      }

Index: DBDEFHandler.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/handlers/DBDEFHandler.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBDEFHandler.java	21 Mar 2004 14:47:11 -0000	1.1.1.1
--- DBDEFHandler.java	21 Mar 2004 18:56:32 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
      public void startElement(String uri, String local, String name, Attributes atts) {

          CurrentElement = UNKNOWN;

+         // System.out.println("<" + name + ">");

          if (name.toUpperCase().equals("TITLE")) {

              CurrentElement = TITLE; 

***************
*** 58,61 ****
--- 59,63 ----
              CurrentIndex = new INDEX();

              for (int i = 0; i < atts.getLength(); i++) {

+                 // System.out.println("INDEX attrib Qname: " + atts.getQName(i));

                  if (atts.getQName(i).toUpperCase().equals("TYPE")) {

                      CurrentIndex.setTYPE(atts.getValue(i));

***************
*** 91,98 ****
              }

              CurrentElement = DBDEF;

!         };

      }

      

!     public void endElement(String name) {

          if (name.toUpperCase().equals("FIELD")) {

              dbdef.addField(CurrentField);

--- 93,102 ----
              }

              CurrentElement = DBDEF;

!         } else {

!             System.out.println("Unkown DBDEF element: " + name);

!         }

      }

      

!     public void endElement(String uri, String local, String name) {

          if (name.toUpperCase().equals("FIELD")) {

              dbdef.addField(CurrentField);


Index: DBLISTHandler.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/handlers/DBLISTHandler.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBLISTHandler.java	21 Mar 2004 14:47:12 -0000	1.1.1.1
--- DBLISTHandler.java	21 Mar 2004 18:56:32 -0000	1.2
***************
*** 32,35 ****
--- 32,39 ----
              if (!url.endsWith("/")) url = new String(url + "/");

              dblist.addDatabase(new DATABASE(url));      

+         } else if (name.toLowerCase().equals("dblist")) {

+             // ok, nothing to do

+         } else {

+             System.out.println("Unkown DBLIST element: " + name);

          }

      }