[Castore-commits] ParserMetaDatas.java 1.3.2.2 1.3.2.3

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-applets/src/java/fr/emn/castor/applets/gestionTypeDoc/typeDocFile
In directory adullact1:/tmp/cvs-serv19735/src/java/fr/emn/castor/applets/gestionTypeDoc/typeDocFile

Modified Files:
      Tag: v1_1_branch
	ParserMetaDatas.java 
Log Message:
correction du bug de parsing XML.

Index: ParserMetaDatas.java
===================================================================
RCS file: /cvsroot/castore/castore-applets/src/java/fr/emn/castor/applets/gestionTypeDoc/typeDocFile/ParserMetaDatas.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** ParserMetaDatas.java	16 Jan 2006 15:58:43 -0000	1.3.2.2
--- ParserMetaDatas.java	6 Mar 2006 09:51:33 -0000	1.3.2.3
***************
*** 50,56 ****
  
  import javax.xml.parsers.FactoryConfigurationError;
- import javax.xml.parsers.ParserConfigurationException;
- import javax.xml.parsers.SAXParser;
- import javax.xml.parsers.SAXParserFactory;
  
  import org.xml.sax.Attributes;
--- 50,53 ----
***************
*** 59,62 ****
--- 56,60 ----
  import org.xml.sax.XMLReader;
  import org.xml.sax.helpers.DefaultHandler;
+ import org.xml.sax.helpers.XMLReaderFactory;
  
  import fr.emn.castor.common.Constants;
***************
*** 97,107 ****
       * @param  ArrayList mdFiles
       */
!     public ParserMetaDatas(ArrayList mdFiles) {
          try {
!             SAXParserFactory saxParserFactory = SAXParserFactory
!                 .newInstance();
!             saxParserFactory.setValidating(false);
!             SAXParser saxParser = saxParserFactory.newSAXParser();
!             this.xmlReader = saxParser.getXMLReader();
              this.xmlReader.setContentHandler(this);
              this.xmlReader.setErrorHandler(this);
--- 95,102 ----
       * @param  ArrayList mdFiles
       */
!     public ParserMetaDatas (ArrayList mdFiles) {
          try {
!             this.xmlReader = XMLReaderFactory
!                 .createXMLReader(Constants.XML_SAX_PARSER);
              this.xmlReader.setContentHandler(this);
              this.xmlReader.setErrorHandler(this);
***************
*** 120,126 ****
              // TODO Bloc catch auto-généré
              e.printStackTrace();
-         } catch (ParserConfigurationException e) {
-             // TODO Bloc catch auto-généré
-             e.printStackTrace();
          } catch (SAXException e) {
              // TODO Bloc catch auto-généré
--- 115,118 ----
***************
*** 184,190 ****
          StringBuffer buf = new StringBuffer();
          buf.append(text, start, length);
          this.charBuf.append(buf.toString().trim());
-         // on ajoute tout de meme un caractere espace a la fin.
-         this.charBuf.append(" ");
      }
  
--- 176,187 ----
          StringBuffer buf = new StringBuffer();
          buf.append(text, start, length);
+         // si on a pas vidé le buffer, on rajoute un espace entre
+         // les caracteres
+         // on vérifie tout de meme si on est pas au début du buffer de lecture
+         // de SAX, sinon on insere un espace en trop !
+         if ((this.charBuf.length() > 0) && (start != 0)) {
+             this.charBuf.append(" ");
+         }
          this.charBuf.append(buf.toString().trim());
      }
  
***************
*** 200,212 ****
              this.currentMetadata.put("wording", this.charBuf
                  .toString().trim());
-             this.charBuf.setLength(0);
              this.inWording = false;
          } else if (qName.equals("help")) {
              this.currentMetadata.put("help", this.charBuf.toString().trim());
-             this.charBuf.setLength(0);
              this.inHelp = false;
          } else if (qName.equals("equivalent_dc")) {
              this.metadataKey = this.charBuf.toString().trim();
-             this.charBuf.setLength(0);
              this.inDcType = false;
          } else if (qName.equals("metadata")) {
--- 197,206 ----
***************
*** 216,219 ****
--- 210,214 ----
              this.inMetadata = false;
          }
+         this.charBuf.setLength(0);
      }