Changeset 2087

Timestamp:

Nov 7, 2011, 12:12:42 PM (12 years ago)

Author:

tjeerd@…

Message:

Possible fix for VIS-46, all fieldId's are now Base64-encoded

File:

• trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/dbnp/visualization/VisualizeController.groovy

@@ -285 +285 @@
             }
             if(type=="templatefields"){
-                fields << [ "id": createFieldId( id: collectionOfFields.id, name: collectionOfFields.name, source: source, type: category ), "source": source, "category": category, "name": collectionOfFields.name ]
+                fields << [ "id": createFieldId( id: collectionOfFields.id.toString(), name: collectionOfFields.name, source: source, type: category ), "source": source, "category": category, "name": collectionOfFields.name ]
             }
             return fields
@@ -1087 +1087 @@
         protected Map parseFieldId( String fieldId ) {
                 def attrs = [:]
-                
-                def parts = fieldId.split(",")
+
+                def parts = fieldId.split(",",5)
                 
                 attrs = [
-                        "id": parts[ 0 ],
-                        "name": parts[ 1 ],
-                        "source": parts[ 2 ],
-                        "type": parts[ 3 ]
+                        "id": new String(parts[ 0 ].decodeBase64()),
+                        "name": new String(parts[ 1 ].decodeBase64()),
+                        "source": new String(parts[ 2 ].decodeBase64()),
+                        "type": new String(parts[ 3 ].decodeBase64()),
+            "unit": parts.length>4? new String(parts[ 4 ].decodeBase64()) : null
                 ]
+
+        return attrs
         }
         
@@ -1110 +1113 @@
                 def source = attrs.source;
                 def type = attrs.type ?: ""
-                
-                return id + "," + name + "," + source + "," + type;
+        def unit = attrs.unit ?: ""
+
+                return id.bytes.encodeBase64().toString() + "," +
+                name.bytes.encodeBase64().toString() + "," +
+                source.bytes.encodeBase64().toString() + "," +
+                type.bytes.encodeBase64().toString() + "," +
+                unit.bytes.encodeBase64().toString();
         }