Changeset 183:8b0ec19c213c

Timestamp:

09/25/08 10:02:01 (5 years ago)

Author:

jbarouh

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@184

Message:

Also adds the contents which are in an unknown xml block.

Files:

• org/w3c/unicorn/response/parser/DefaultParser.java (modified) (9 diffs)

org/w3c/unicorn/response/parser/DefaultParser.java

@@ -9 +9 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.math.BigInteger;
 import java.net.URL;
 import java.util.ArrayList;
@@ -18 +19 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
@@ -64 +66 @@
                 try {
                         org.w3.unicorn.observationresponse.ObservationresponseDocument ord = org.w3.unicorn.observationresponse.ObservationresponseDocument.Factory
-                                        .parse(r);
+                                .parse(r);
+                        /*
+                        File xml = new File("validator.xml");
+                        BufferedReader fr = new BufferedReader(new FileReader(xml));
+                        String s;
+                        String resp ="";
+                        while ((s=fr.readLine()) != null) {
+                                resp += s + "\n";
+                        }
+                        //System.out.println(resp);
+                        fr.close();
+                        org.w3.unicorn.observationresponse.ObservationresponseDocument ord = org.w3.unicorn.observationresponse.ObservationresponseDocument.Factory
+                        .parse(resp);
+                        */
                         return swap(ord);
-                } catch (XmlException e) {
+                } catch (Exception e) {
                         e.printStackTrace();
                         return null;
@@ -365 +380 @@
                                 }
 
-                                // If the class is not recognized, we check the name
-
-                                // Case : A
+                                // If the class is not recognized, we check the name and eventually 
+                                // build the corresponding object
+
+                                // Case : A from XmlAnyTypeImpl
                                 else if (cursor.getName().toString().equals(
                                                 "{http://www.w3.org/unicorn/observationresponse}a")) {
@@ -377 +393 @@
                                         coy.setHref(cursor.getTextValue());
                                         cursor.toPrevToken();
-                                        cursor.toNextAttribute();
+                                        cursor.push();
                                         content = swapObj(current, lang);
+                                        cursor.pop();
                                         coy.setContent(content);
                                         list.add(coy);
@@ -386 +403 @@
                                                         count++;
                                         }
+                                        cursor.toEndToken();
+                                        count--;
                                         
-                                        cursor.toEndToken();
-                                        
-
-                                }
-
-                                // Case : Code
+                                }
+
+                                // Case : Code from XmlAnyTypeImpl
                                 else if (cursor.getName().toString().equals(
                                                 "{http://www.w3.org/unicorn/observationresponse}code")) {
+                                        
                                         Code coy = new Code();
                                         List<Object> content = new ArrayList<Object>();
+                                        cursor.push();
                                         content = swapObj(current, lang);
+                                        cursor.pop();
                                         coy.setContent(content);
                                         list.add(coy);
@@ -404 +423 @@
                                                         count++;
                                         }
-                                        cursor.toEndToken();
-                                }
-
-                                // Case : Img
+                                        cursor.toEndToken(); 
+                                        count--;
+                                }
+
+                                // Case : Img from XmlAnyTypeImpl
                                 else if (cursor.getName().toString().equals(
                                                 "{http://www.w3.org/unicorn/observationresponse}img")) {
-                                        org.w3.unicorn.observationresponse.ImgDocument.Img img = (org.w3.unicorn.observationresponse.ImgDocument.Img) current;
+                                        
+                                        cursor.toNextToken();
+
                                         Img coy = new Img();
-                                        coy.setAlt(img.getAlt());
-                                        coy.setHeight(img.getHeight());
-                                        coy.setLongdesc(img.getLongdesc());
-                                        coy.setName(img.getName());
-                                        coy.setSrc(img.getSrc());
-                                        coy.setWidth(img.getWidth());
-                                        list.add(coy);
-
-                                        cursor.toEndToken();
+                                        while (cursor.isAttr() && cursor.hasNextToken()) {
+                                                
+                                                if (cursor.getName().toString().equals("src")) 
+                                                        coy.setSrc(cursor.getTextValue());
+                                                else if (cursor.getName().toString().equals("alt")) 
+                                                        coy.setAlt(cursor.getTextValue());
+                                                else if (cursor.getName().toString().equals("longdesc")) 
+                                                        coy.setLongdesc(cursor.getTextValue());
+                                                else if (cursor.getName().toString().equals("name"))
+                                                        coy.setName(cursor.getTextValue());
+                                                else if (cursor.getName().toString().equals("width"))
+                                                        coy.setWidth(new BigInteger(cursor.getTextValue()));
+                                                else if (cursor.getName().toString().equals("height"))
+                                                        coy.setHeight(new BigInteger(cursor.getTextValue()));
+                                                                                                        
+                                                cursor.toNextToken();
+                                        }
+                                        list.add(coy);
+                                        cursor.toEndToken();
+                                        count--;
+
                                 }
 
@@ -426 +460 @@
                                 // We still want to append what's inside a block even if the block's unknown
                                 else {
+                                        cursor.push();
                                         list.addAll(swapObj(current,lang));
-                                        cursor.toEndToken();
+                                        cursor.pop();
+                                        cursor.toEndToken();
+                                        count--;
                                 }
                         }
@@ -439 +476 @@
                         else if (cursor.isEnd()) {
                                 count--;
-                                if (count < 0)
+                                if (count <= 0)
                                         break;
                         }