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

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

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

Modified Files:
	WMLHandler.java 
Log Message:
Fixed parsing of strings from WML.


Index: WMLHandler.java
===================================================================
RCS file: /cvsroot/woc/woc/source/wocjava/source/com/egonw/woc/files/WMLHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** WMLHandler.java	8 Jun 2002 20:29:02 -0000	1.1
--- WMLHandler.java	16 Aug 2002 15:17:00 -0000	1.2
***************
*** 201,204 ****
--- 201,205 ----
          for (int i = 0; i < atts.getLength(); i++) {
            // System.out.println(" Att: " + atts.getQName(i));
+           // System.out.println("      " + atts.getValue(i));
            if (atts.getQName(i).equals("CLASS")) {
              if (atts.getValue(i).equals("MSDS-CODE")) {
***************
*** 481,548 ****
  
      public void characters (char ch[], int start, int length) {
! 	StringBuffer x = new StringBuffer();
! 	switch (CurrentElement) {
! 	case ANY :
! 	    for (int i =0; i < length; i++)
! 		x.append(ch[start+i]);
! 	    memo.add(x.toString());
! 	    break;
! 	case XSL : 
! 	    for (int i =0; i < length; i++)
! 		xslString.append(ch[start+i]);
! 	    break;
! 	case XItem.XFORMULA :
! 	    formula.setCDATA(toString(ch, start, length).trim());
! 	    break;
! 	case XItem.XDISCDATE :
! 	    DiscDate = toString(ch, start, length).trim();
! 	    break;
! 	case XItem.XDISCPLACE :
! 	    DiscPlace = toString(ch, start, length).trim();
! 	    break;
!       case LANG :
!         x.append(xlang.getValue());
!         for (int i =0; i < length; i++)
!           x.append(ch[start+i]);
!         xlang.setValue(x.toString().trim());
!         break;
!       case INDEX :
!         for (int i =0; i < length; i++) x.append(ch[start+i]);
!         // System.out.println("  content: " + x.toString() + "-");
!         switch (CI) {
!           case CI_MSDS:
!             item.add(Item.MSDS, x.toString());
!             break;
!           case CI_CAS:
!             item.add(Item.CASNR, x.toString());
              break;
!           case CI_NSC:
!             item.add(XItem.XNSC, x.toString());
              break;
!           case CI_SMILES:
!             item.add(Item.SMILE, x.toString());
              break;
!           case CI_UNNR:
!             item.add(XItem.XUNNR, x.toString());
              break;
!           case CI_ENR:
!             item.add(XItem.XENR, x.toString());
              break;
-         }
-         break;
        case XItem.XMEDIA :
!         x = new StringBuffer(media.getCDATA());
!         for (int i =0; i < length; i++)
!           x.append(ch[start+i]);
!         media.setCDATA(x.toString());
          break;
        case XItem.XINSERTS :
!         insert.setCDATA(toString(ch, start, length).trim());
          break;
        case XItem.XAFKORT :
!         abbrev.setCDATA(toString(ch, start, length).trim());
          break;
        case Item.URL :
!         String url = toString(ch, start, length).trim();
          if (url.length() > 0) {
            v.addElement(url);
--- 482,545 ----
  
      public void characters (char ch[], int start, int length) {
!         String s = new String(ch, start, length);
!         switch (CurrentElement) {
!         case ANY :
!            memo.add(s);
!            break;
!         case XSL :
!            xslString.append(s);
!            break;
!         case XItem.XFORMULA :
!             formula.setCDATA(s.trim());
              break;
!         case XItem.XDISCDATE :
!             DiscDate = s.trim();
              break;
!         case XItem.XDISCPLACE :
!             DiscPlace = s.trim();
              break;
!         case LANG :
!             xlang.setValue(xlang.getValue() + s.trim());
              break;
!         case INDEX :
!             s = s.trim();
!             // System.out.println("Parsing INDEX chars: " + s);
!             switch (CI) {
!                 case CI_MSDS:
!                     item.add(Item.MSDS, s);
!                     break;
!                 case CI_CAS:
!                     // System.out.println("Adding CAS");
!                     if (item.get(Item.CASNR) != null) {
!                         item.add(Item.CASNR, item.get(Item.CASNR) + s);
!                     } else {
!                         item.add(Item.CASNR, s);
!                     }
!                     break;
!                 case CI_NSC:
!                     item.add(XItem.XNSC, s);
!                     break;
!                 case CI_SMILES:
!                     item.add(Item.SMILE, s);
!                     break;
!                 case CI_UNNR:
!                     item.add(XItem.XUNNR, s);
!                     break;
!                 case CI_ENR:
!                     item.add(XItem.XENR, s);
!                     break;
!             }
              break;
        case XItem.XMEDIA :
!         media.setCDATA(media.getCDATA() + s);
          break;
        case XItem.XINSERTS :
!         insert.setCDATA(s.trim());
          break;
        case XItem.XAFKORT :
!         abbrev.setCDATA(s.trim());
          break;
        case Item.URL :
!         String url = s.trim();
          if (url.length() > 0) {
            v.addElement(url);
***************
*** 550,554 ****
          break;
        case Item.GROUP :
!         String s = toString(ch, start, length).trim();
          if (s.length() > 0) {
            groups.addElement(s);
--- 547,551 ----
          break;
        case Item.GROUP :
!         s = s.trim();
          if (s.length() > 0) {
            groups.addElement(s);
***************
*** 559,571 ****
          break;
        case XItem.XMEERVOUD :
! 	  s = toString(ch, start, length).trim();
            meervoud.setCDATA(s);
            break;
        case Item.VERGELIJK :
!         s = toString(ch, start, length).trim();
          if (s.length() > 0) vergs.addElement(s);
          break;
        case Item.ZIE :
!         s = toString(ch, start, length).trim();
          if (s.length() > 0) zies.addElement(s);
          break;
--- 556,568 ----
          break;
        case XItem.XMEERVOUD :
!           s = s.trim();
            meervoud.setCDATA(s);
            break;
        case Item.VERGELIJK :
!         s = s.trim();
          if (s.length() > 0) vergs.addElement(s);
          break;
        case Item.ZIE :
!         s = s.trim();
          if (s.length() > 0) zies.addElement(s);
          break;