Author: [log in to unmask]
Date: Thu Nov 13 11:49:31 2014
New Revision: 1505
Log:
Make value map accessible via the ConditionsObject API.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java
java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsObject.java Thu Nov 13 11:49:31 2014
@@ -70,9 +70,10 @@
throw new ConditionsObjectException("There are no field values to insert.");
if (!hasValidCollection())
throw new ConditionsObjectException("The object's collection ID is not valid.");
- String query = QueryBuilder.buildInsert(getTableMetaData().getTableName(), getCollectionId(), getTableMetaData().getFieldNames(), fieldValues.valuesToArray());
+ String query = QueryBuilder.buildInsert(getTableMetaData().getTableName(), getCollectionId(), getTableMetaData().getFieldNames(), fieldValues.valuesToArray());
+ System.out.println(query);
List<Integer> keys = DatabaseConditionsManager.getInstance().updateQuery(query);
- if (keys.size() == 0 || keys.size() > 1) {
+ if (keys.size() != 1) {
throw new ConditionsObjectException("SQL insert returned wrong number of keys: " + keys.size());
}
rowId = keys.get(0);
@@ -130,6 +131,10 @@
public <T> T getFieldValue(Class<T> klass, String field) {
return klass.cast(fieldValues.get(field));
}
+
+ public FieldValueMap getFieldValues() {
+ return this.fieldValues;
+ }
@SuppressWarnings("unchecked")
public <T> T getFieldValue(String field) {
@@ -162,7 +167,7 @@
this.rowId = rowId;
}
- private boolean hasValidCollection() {
+ boolean hasValidCollection() {
return collectionId != -1;
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsObject.java Thu Nov 13 11:49:31 2014
@@ -83,6 +83,12 @@
* values.
*/
void setFieldValues(FieldValueMap fieldValues);
+
+ /**
+ * Get the map of field values.
+ * @return The <code>FieldValueMap</code>.
+ */
+ FieldValueMap getFieldValues();
/**
* Get a field value, cast to the given class.
|