From 8cd8fe5fe2be302a2e5916a7d96dc6ee4c2f0c04 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 29 Jan 2004 16:23:01 +0000
Subject: [PATCH] Patch level         : 2.0 nopatch Files correlati     :
 Ricompilazione Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@11732 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 omnia/Omnia0.cpp | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/omnia/Omnia0.cpp b/omnia/Omnia0.cpp
index fab0e925e..668a7c7cd 100755
--- a/omnia/Omnia0.cpp
+++ b/omnia/Omnia0.cpp
@@ -130,18 +130,35 @@ const TString& TTextRecord::GetValue(const TString& name) const
   const TXmlItem* f = FindField(name);
   if (f != NULL)
     return GetFieldValue(*f);
-  return EMPTY_STRING;
+  return name;
 }
 
 const TString& TTextRecord::Evaluate(TExpression& exp) const
 {
-  for (int i = exp.numvar()-1; i >= 0; i--)
+  TString& str = (TString&)m_str;
+  
+  str = exp.string();
+  if (str.starts_with("BEFORE(AFTER"))
   {
-    const TString& name = exp.varname(i);
-    const TString& value = GetValue(name);
-    exp.setvar(i, value);
+    int i = 0;
+    i++;
   }
-  return exp.as_string();  
+
+  const int nv = exp.numvar();
+  if (nv > 0)
+  {
+    for (int i = nv-1; i >= 0; i--)
+    {
+      const TString& name = exp.varname(i);
+      const TString& value = GetValue(name);
+      exp.setvar(i, value);
+    }
+    str = exp.as_string();  
+  }
+  else
+    str = exp.string();  // Nessuna variabile = costante!
+
+  return str;
 }
 
 ///////////////////////////////////////////////////////////
@@ -272,11 +289,17 @@ ofstream& TCasaEditrice::ChooseOutput(const TTextRecord& rec)
 TCasaEditrice::TCasaEditrice(const TXmlItem& trc, const char* name) : m_trc(trc), m_exprSuffix(NULL)
 {
   const TFilename path(name);
-  m_strExt = path.ext();
-  m_strPrefix = path.name();
-  const int dot = m_strPrefix.find('.');
+  const int dot = path.rfind('.');
   if (dot >= 0)
-    m_strPrefix.cut(dot);
+  {
+    m_strPrefix = path.left(dot);
+    m_strExt = path.mid(dot+1);
+  }
+  else
+  {
+    m_strPrefix = path;
+    m_strExt.cut(0);
+  }
 
   const TXmlItem* pOutFile = m_trc.FindFirst("Output");
   CHECK(pOutFile, "NULL Output tag");