Changeset 32850

Timestamp:

02/03/15 23:34:16 (8 years ago)

Author:

obi

Message:

fix recordname stripping

Location:

titan/titan

Files:

• mediadb.h (modified) (2 diffs)
• record.h (modified) (1 diff)

titan/titan/mediadb.h

@@ -1495 +1495 @@
         // create filelist info
         tmpstr = ostrcat(tmpstr, file, 1, 0);
-        char* tmpstr1 = oregex(".*([0-9]{14,14}).*", tmpstr);
-        if(tmpstr1 != NULL)
-        {
-                shortname = string_replace(tmpstr1, "", shortname, 1);
-                if(fileinfo != NULL)
-                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
-                fileinfo = ostrcat(fileinfo, "rec", 1, 0);
-                *isrec = 1;
-        }                       
-        free(tmpstr1); tmpstr1 = NULL;
-
-        tmpstr1 = oregex(".*([0-9]{8,8}.*[0-9]{4,4}).*", tmpstr);
-        if(tmpstr1 != NULL && *isrec == 0)
-        {
-                shortname = string_replace(tmpstr1, "", shortname, 1);
-                if(fileinfo != NULL)
-                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
-                fileinfo = ostrcat(fileinfo, "recold", 1, 0);
-                *isrec = 1;
-        }
-        free(tmpstr1); tmpstr1 = NULL;
-
-        tmpstr1 = oregex(".*([0-9]{5,5}).*", tmpstr);
-        if(tmpstr1 != NULL && *isrec == 0)
-        {
-                *iscam = 1;
-                if(fileinfo != NULL)
-                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
-                fileinfo = ostrcat(fileinfo, "cam", 1, 0);
-        }
-        free(tmpstr1), tmpstr1 = NULL;
-
-        if(*isrec == 0 && *iscam == 0)
-        {
-                string_tolower(shortname);
-                shortname = string_shortname(shortname, 2);
-                string_removechar(shortname);
-                strstrip(shortname);
-        }
-        else
-        {
-                char* cut = ostrcat(".", getfilenameext(tmpstr), 0, 1);
-                cut = ostrcat(cut, "\0", 1, 0);
-                shortname = string_replace(cut, "\0", shortname, 1);
-                free(cut); cut = NULL;
-
-                string_removechar(shortname);
-                strstrip(shortname);
-        }
 
 printf("###### strip () strings start ############################################\n");
@@ -1589 +1540 @@
 // end
 printf("###### strip () strings end ############################################\n");
+
+        char* tmpstr1 = oregex(".*([0-9]{14,14}).*", tmpstr);
+        if(tmpstr1 != NULL)
+        {
+                shortname = string_replace(tmpstr1, "", shortname, 1);
+                if(fileinfo != NULL)
+                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
+                fileinfo = ostrcat(fileinfo, "rec", 1, 0);
+                *isrec = 1;
+        }                       
+        free(tmpstr1); tmpstr1 = NULL;
+
+        tmpstr1 = oregex(".*([0-9]{8,8}.*[0-9]{4,4}).*", tmpstr);
+        if(tmpstr1 != NULL && *isrec == 0)
+        {
+                shortname = string_replace(tmpstr1, "", shortname, 1);
+                if(fileinfo != NULL)
+                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
+                fileinfo = ostrcat(fileinfo, "recold", 1, 0);
+                *isrec = 1;
+        }
+        free(tmpstr1); tmpstr1 = NULL;
+
+        tmpstr1 = oregex(".*([0-9]{5,5}).*", tmpstr);
+        if(tmpstr1 != NULL && *isrec == 0)
+        {
+                *iscam = 1;
+                if(fileinfo != NULL)
+                        fileinfo = ostrcat(fileinfo, " ", 1, 0);
+                fileinfo = ostrcat(fileinfo, "cam", 1, 0);
+        }
+        free(tmpstr1), tmpstr1 = NULL;
+
+        if(*isrec == 0 && *iscam == 0)
+        {
+                string_tolower(shortname);
+                shortname = string_shortname(shortname, 2);
+                string_removechar(shortname);
+                strstrip(shortname);
+        }
+        else
+        {
+                char* cut = ostrcat(".", getfilenameext(tmpstr), 0, 1);
+                cut = ostrcat(cut, "\0", 1, 0);
+                shortname = string_replace(cut, "\0", shortname, 1);
+                free(cut); cut = NULL;
+
+                string_removechar(shortname);
+                strstrip(shortname);
+        }
 
         string_tolower(tmpstr);

titan/titan/record.h

@@ -863 +863 @@
         buf1 = ostrcat(buf, NULL, 1, 0);
 
-        tmpstr = ostrcat(tmpstr, "-", 1, 0);
+        if(type != RECTIMESHIFT && recordnamefmt == 1)
+                tmpstr = ostrcat(tmpstr, "-", 1, 0);
+        else
+                tmpstr = ostrcat(tmpstr, " (", 1, 0);   
         tmpstr = ostrcat(tmpstr, buf1, 1, 1);
         tmpstr = ostrcat(tmpstr, ")", 1, 0);