Changeset 216

Timestamp:

11/12/08 15:33:14 (8 weeks ago)

Author:

tinova

Message:

Modifying TemplateSQL class to support insert/delete attributes.

Location:

one/branches/DEVELOPMENT/VirtualNetworkManager

Files:

• include/Attribute.h (modified) (3 diffs)
• include/TemplateSQL.h (modified) (1 diff)
• src/template/TemplateSQL.cc (modified) (4 diffs)

one/branches/DEVELOPMENT/VirtualNetworkManager/include/Attribute.h

@@ -34 +34 @@
 public:
 
-    Attribute(string& aname):attribute_name(aname)
+    Attribute(const string& aname):attribute_name(aname)
     {
         transform (
@@ -105 +105 @@
 public:
 
-    SingleAttribute(string& name):Attribute(name){};
-
-    SingleAttribute(string& name, string& value):
+    SingleAttribute(const string& name):Attribute(name){};
+
+    SingleAttribute(const string& name, const string& value):
         Attribute(name),attribute_value(value){};
     
-    SingleAttribute(const char * name, string& value):
+    SingleAttribute(const char * name, const string& value):
         Attribute(name),attribute_value(value){};
 
@@ -170 +170 @@
 public:
 
-    VectorAttribute(string& name):Attribute(name){};
-
-    VectorAttribute(string& name, map<string,string>& value):
+    VectorAttribute(const string& name):Attribute(name){};
+
+    VectorAttribute(const string& name,const  map<string,string>& value):
             Attribute(name),attribute_value(value){};
 

one/branches/DEVELOPMENT/VirtualNetworkManager/include/TemplateSQL.h

@@ -93 +93 @@
      *    @param value of the new attribute. 
      */
-    int replace_attribute(SqliteDB * db, string& name, string& value);    
+    int replace_attribute(SqliteDB * db, const string& name, const string& value); 
+    
+    /**
+     *  Inserts single attribute 
+     *    @param db pointer to the database.
+     *    @param name of the attribute.
+     *    @param value of the attribute.
+     */
+    int insert_attribute(SqliteDB * db, const string& name, const string& value);   
+    
+    /**
+     *  Inserts vector attribute 
+     *    @param db pointer to the database.
+     *    @param name of the attribute.
+     *    @param values of the attribute.
+     */
+    int insert_attribute(SqliteDB *                 db, 
+                         const string&              name, 
+                         const map<string, string>& values);
+    
+    /**
+     *  Removes all occurences of a given attribute (SINGLE OR VECTOR)
+     *    @param db pointer to the database.
+     *    @param name of the attribute.
+     */
+    int delete_attribute(SqliteDB * db, const string& name);
 };
 

one/branches/DEVELOPMENT/VirtualNetworkManager/src/template/TemplateSQL.cc

@@ -245 +245 @@
 int TemplateSQL::replace_attribute(
         SqliteDB *                                      db, 
-        string&                                         name, 
-        string&                                         value)
+        const string&                           name, 
+        const string&                           value)
 {
     ostringstream   oss;
@@ -253 +253 @@
     multimap<string, Attribute *>::const_iterator       i;
     Attribute *         attribute;
+    
+    string          _name  = name;
+    string          _value = value;
     
     if ( id == -1 || name.empty() || name.empty() )
@@ -288 +291 @@
     }
 
-        attribute = new SingleAttribute(name,value);
+        attribute = new SingleAttribute(_name,_value);
         
         attributes.insert(make_pair(attribute->name(),attribute));
@@ -303 +306 @@
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+
+int TemplateSQL::insert_attribute(SqliteDB *    db, 
+                                  const string& name, 
+                                  const string& value)
+{
+    ostringstream   oss;
+    
+    Attribute *         attribute;
+    
+        
+    attribute = new SingleAttribute(name,value);
+        
+        attributes.insert(make_pair(attribute->name(),attribute));
+        
+        oss.str("");
+        
+    oss << "INSERT INTO " << table << " " << db_names
+        << " VALUES (" << id << ",'" << name << "'," << 
+        Attribute::SIMPLE <<",'" << value << "')";
+
+    return db->exec(oss);
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int TemplateSQL::insert_attribute(SqliteDB *           db, 
+                                  const string&        name, 
+                                  const map<string, string>& values)
+{
+    ostringstream   oss;
+    
+    Attribute *     attribute;
+    string    *     attr;
+             
+    attribute = new VectorAttribute(name,values);
+        
+        attributes.insert(make_pair(attribute->name(),attribute));
+        
+        oss.str("");
+        
+        attr  = attribute->marshall();
+
+    if ( attr == 0 )
+    {
+        return -1;
+    }
+
+    oss << "INSERT OR REPLACE INTO " << table << " " << db_names
+        << " VALUES (" << id << ",'" << name << "',"<< Attribute::VECTOR <<",'"
+        << *attr << "')";
+
+    return db->exec(oss);    
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
+int TemplateSQL::delete_attribute(SqliteDB * db, const string& name)
+{
+    ostringstream   oss;
+    int                         rc;
+            
+    multimap<string, Attribute *>::const_iterator       i;
+    
+    i = attributes.find(name);
+
+    if ( i != attributes.end() ) //attribute exists
+    {
+            oss << "DELETE FROM " << table << " WHERE id=" << id 
+                << " AND name='" << name << "'";
+
+        rc = db->exec(oss);
+
+        if ( rc != 0 )
+        {
+               return rc;
+        }
+
+        attributes.erase(name);
+    }
+    
+    return 0;
+}