From d85750dba2d0a47036616adc71225538ced3bbf7 Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Thu, 22 Oct 2009 19:59:22 +0000
Subject: [PATCH] prevent reloading existing DSM; saving old diagram collection
 (running calls)

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1563 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/dsm/DSM.cpp | 41 ++++++++++++++++++++++++++---------------
 apps/dsm/DSM.h   |  2 ++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/apps/dsm/DSM.cpp b/apps/dsm/DSM.cpp
index 59aada17..7794448f 100644
--- a/apps/dsm/DSM.cpp
+++ b/apps/dsm/DSM.cpp
@@ -99,6 +99,10 @@ DSMFactory::~DSMFactory() {
   for (map<string, AmPromptCollection*>::iterator it=
 	 prompt_sets.begin(); it != prompt_sets.end(); it++)
     delete it->second;
+
+  for (vector<DSMStateDiagramCollection*>::iterator it=
+	 old_diags.begin(); it != old_diags.end(); it++)
+    delete *it;
 }
 
 int DSMFactory::onLoad()
@@ -557,13 +561,10 @@ void DSMFactory::reloadDSMs(const AmArg& args, AmArg& ret) {
     }
   }
   diags_mut.lock();
-  DSMStateDiagramCollection* old_diags = diags;
+  old_diags.push_back(diags);
   diags = new_diags; 
   diags_mut.unlock();
 
-  DBG("deleting old diagram collection\n");
-  delete old_diags;
-
   ret.push(200);
   ret.push("DSMs reloaded");
 }
@@ -685,7 +686,7 @@ void DSMFactory::loadDSM(const AmArg& args, AmArg& ret) {
   if(cfg.loadFile(AmConfig::ModConfigPath + string(MOD_NAME ".conf"))) {
       ret.push(500);
       ret.push("loading config file " +AmConfig::ModConfigPath + string(MOD_NAME ".conf"));
-      return ;
+      return;
   }
 
   string DiagPath = cfg.getParameter("diag_path");
@@ -697,12 +698,17 @@ void DSMFactory::loadDSM(const AmArg& args, AmArg& ret) {
   string dsm_file_name = DiagPath+dsm_name+".dsm";
   string res = "OK";
   diags_mut.lock();
-  if (!diags->loadFile(dsm_file_name, dsm_name, ModPath, DebugDSM)) {
-    ret.push(500);
-    ret.push("error loading "+dsm_name+" from "+ dsm_file_name);
+  if (diags->hasDiagram(dsm_name)) {
+    ret.push(400);
+    ret.push("DSM named '" + dsm_name + "' already loaded (use reloadDSMs to reload all)");
   } else {
-    ret.push(200);
-    ret.push("loaded "+dsm_name+" from "+ dsm_file_name);
+    if (!diags->loadFile(dsm_file_name, dsm_name, ModPath, DebugDSM)) {
+      ret.push(500);
+      ret.push("error loading "+dsm_name+" from "+ dsm_file_name);
+    } else {
+      ret.push(200);
+      ret.push("loaded "+dsm_name+" from "+ dsm_file_name);
+    }
   }
   diags_mut.unlock();
 }
@@ -714,12 +720,17 @@ void DSMFactory::loadDSMWithPaths(const AmArg& args, AmArg& ret) {
 
   string res = "OK";
   diags_mut.lock();
-  if (!diags->loadFile(diag_path+dsm_name+".dsm", dsm_name, mod_path, DebugDSM)) {
-    ret.push(500);
-    ret.push("error loading "+dsm_name+" from "+ diag_path+dsm_name+".dsm");
+  if (diags->hasDiagram(dsm_name)) {
+    ret.push(400);
+    ret.push("DSM named '" + dsm_name + "' already loaded (use reloadDSMs to reload all)");
   } else {
-    ret.push(200);
-    ret.push("loaded "+dsm_name+" from "+ diag_path+dsm_name+".dsm");
+    if (!diags->loadFile(diag_path+dsm_name+".dsm", dsm_name, mod_path, DebugDSM)) {
+      ret.push(500);
+      ret.push("error loading "+dsm_name+" from "+ diag_path+dsm_name+".dsm");
+    } else {
+      ret.push(200);
+      ret.push("loaded "+dsm_name+" from "+ diag_path+dsm_name+".dsm");
+    }
   }
   diags_mut.unlock();
 }
diff --git a/apps/dsm/DSM.h b/apps/dsm/DSM.h
index 29187a30..b431f810 100644
--- a/apps/dsm/DSM.h
+++ b/apps/dsm/DSM.h
@@ -63,6 +63,8 @@ class DSMFactory
   DSMStateDiagramCollection* diags;
   AmMutex diags_mut;
 
+  vector<DSMStateDiagramCollection*> old_diags;
+
   static bool DebugDSM;
 
   static string InboundStartDiag;