Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv17450
Modified Files:
DataTypes.java
Log Message:
MMB-1736
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1736
Index: DataTypes.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/DataTypes.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- DataTypes.java 4 Sep 2008 05:56:22 -0000 1.31
+++ DataTypes.java 1 Dec 2008 17:24:34 -0000 1.32
@@ -39,7 +39,7 @@
*</p>
* @author Pierre van Rooden
* @since MMBase-1.8
- * @version $Id: DataTypes.java,v 1.31 2008/09/04 05:56:22 michiel Exp $
+ * @version $Id: DataTypes.java,v 1.32 2008/12/01 17:24:34 michiel Exp $
*/
public class DataTypes {
@@ -111,7 +111,7 @@
URL u = i.previous();
URLConnection con = u.openConnection();
if (con.getDoInput()) {
- log.service("Reading " + u);
+ log.service("Reading " + u + " with weight " +
ResourceLoader.getWeight(u));
InputSource dataTypesSource = new
InputSource(con.getInputStream());
dataTypesSource.setSystemId(u.toExternalForm());
DocumentBuilder db =
DocumentReader.getDocumentBuilder(true, true,
@@ -119,7 +119,9 @@
new
org.mmbase.util.xml.EntityResolver(true, DataTypeReader.class));
Document doc = db.parse(dataTypesSource);
Element dataTypesElement = doc.getDocumentElement(); //
fieldtypedefinitons or datatypes element
-
failed.addAll(DataTypeReader.readDataTypes(dataTypesElement,
dataTypeCollector));
+ List<DependencyException> f =
DataTypeReader.readDataTypes(dataTypesElement, dataTypeCollector);
+ log.service("Failed " + f);
+ failed.addAll(f);
} else {
log.debug("Not reading, because not existing " + u);
}
@@ -127,6 +129,7 @@
log.error(e.getMessage(), e);
}
}
+
while (readFailedDependencies(failed) > 0);
if (failed.size() > 0) {
@@ -180,6 +183,7 @@
case Field.TYPE_NODE: return new NodeDataType(name);
case Field.TYPE_DATETIME: return new DateTimeDataType(name);
case Field.TYPE_LIST: return new ListDataType(name);
+ case Field.TYPE_DECIMAL: return new DecimalDataType(name);
default: return new BasicDataType(name);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
