No commit message

CMakeLists.txt

@@ -13,7 +13,7 @@ if(USE_CLANG)
 endif(USE_CLANG)
 
 
-project (logfilegen VERSION 3.0.1 LANGUAGES CXX)
+project (logfilegen VERSION 3.0.2 LANGUAGES CXX)
 add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
 
 

ChangeLog

@@ -1,3 +1,8 @@
+3.0.2
+* @seq macros fix. Syntax change!
+Was: @seq:param1:param2:etc
+Now: @seq:param1|param2|etc
+
 3.0.1
 * @meta fix
 * randomizer rewrote

NEWS

@@ -5,3 +5,7 @@ This release introduces the multithread support (performance improved), fixes ma
 upd 3.0.1
 * @meta macro fixes
 * randomizer code has been rewritten
+upd 3.0.2
+* @seq macros fix. Syntax change!
+Was: @seq:param1:param2:etc
+Now: @seq:param1|param2|etc

docs/templates.md

@@ -267,14 +267,14 @@ Please note, the file name after ```@file``` must be an absolute file path, or,
 
 #### @seq
 
-Works like **sequence** variable values. Each value is separated by ```:```.
+Works like **sequence** variable values. Each value is separated by ```|```.
 
-Syntax: ```@seq:param1:param2:etc```
+Syntax: ```@seq:param1|param2|etc```
 
 Example:
 
 ```
-$test=@seq:GET:PUT
+$test=@seq:GET|PUT
 $logstring=hello, $test
 ```
 

macro.cpp

@@ -495,10 +495,24 @@ void CMacroSeq::parse (const string &s)
   length = 0;
   text = "";
 
+  size_t pos = s.find_first_of ("|");
+  if (pos == std::string::npos)
+     return;
+
+
 //  vt = split_string_to_vector_a (s, ':', '/');
-  vt = split_string_to_vector (s, ":");
 
+  pos = s.find_first_of (":");
+  if (pos == std::string::npos)
+     return;
+
+  std::string t = s.substr (pos);
 
+ // cout << "t: " << t << endl;
+
+  vt = split_string_to_vector (t, "|");
+
+// vt = split_string_to_vector (s, ":");
 }
 
 
@@ -508,6 +522,9 @@ string CMacroSeq::process()
 
   //cout << "vt.size(): " << vt.size() << endl;
 
+   if (vt.size() == 0)
+      return string();
+
    size_t i = get_rnd (1, vt.size() - 1);
 
     //    cout << "CMacroSeq::process() 2:" << i << endl;

main.cpp

@@ -41,7 +41,7 @@
 
 
 #ifndef VERSION_NUMBER
-#define VERSION_NUMBER "3.0.1"
+#define VERSION_NUMBER "3.0.2"
 #endif
 
 

tpl.cpp

@@ -88,7 +88,7 @@ CTpl::CTpl (const string &fname, const string &amode)
       vars.insert (std::make_pair ("%t", new CVar ("%t", "@datetime:%d/%b/%Y:%H:%M:%S %z")));
 
       //$request $uri $protocol
-      vars.insert (std::make_pair ("%r", new CVar ("%r", "@meta:(@seq:/GET:/PUT) (@path:1:5:3) (@seq:HTTP/1.1:/HTTP/2.0)")));
+      vars.insert (std::make_pair ("%r", new CVar ("%r", "@meta:(@seq:/GET|/PUT) (@path:1:5:3) (@seq:HTTP/1.1|/HTTP/2.0)")));
 
       vars.insert (std::make_pair ("%>s", new CVar ("%>s", "200|400")));
       vars.insert (std::make_pair ("%b", new CVar ("%b", "1..9999")));