| ID |
Date |
Icon |
Author |
Author Email |
Category |
OS |
ELOG Version |
Subject |
|
67606
|
Thu Nov 7 08:08:12 2013 |
 | Stefan Ritt | stefan.ritt@psi.ch | Bug report | Mac OSX | 2.9.2-2494 | Re: Compilation failure on Mac OSX 10.9 |
| A.G. Schubert wrote: |
|
| Stefan Ritt wrote: |
|
| A.G. Schubert wrote: |
|
When compiling elog on OSX 10.9 (Mavericks), I get the error below.
Elog will compile without error if I add -D_FORTIFY_SOURCE=0 to CFLAGS in Makefile, but I'm not sure whether this is a good idea.
|
All over sudden gcc comes with its own version of "strlcpy", which I had defined "manually" since many years inside ELOG. Using -DFORTIFY_SOURCE=0 will not harm, so you can use it. The "real" solution is to take our ELOG's strlcpy/strlcat, which I did on the current SVN version.
Best regards,
Stefan
|
Ok, I tried updating my SVN working copy, but I didn't get any updates past elog rev. 2494, mxml rev. 74. I undid my changes to Makefile, tried to compile, but got the same errors.
I then pulled down elog and mxml with git, and these are working for me with no errors. Thanks!
|
SVN is obsolete and will NOT be maintained any more, since we completely switched to GIT. Actually I will disable the service soon. |
|
67650
|
Tue Jan 14 05:19:47 2014 |
| Ed McNichol | ed@mcnichol.com | Bug report | Mac OSX | 2.9.2-2494 | Re: Compilation failure on Mac OSX 10.9 |
| Stefan Ritt wrote: |
|
| A.G. Schubert wrote: |
|
| Stefan Ritt wrote: |
|
| A.G. Schubert wrote: |
|
When compiling elog on OSX 10.9 (Mavericks), I get the error below.
Elog will compile without error if I add -D_FORTIFY_SOURCE=0 to CFLAGS in Makefile, but I'm not sure whether this is a good idea.
|
All over sudden gcc comes with its own version of "strlcpy", which I had defined "manually" since many years inside ELOG. Using -DFORTIFY_SOURCE=0 will not harm, so you can use it. The "real" solution is to take our ELOG's strlcpy/strlcat, which I did on the current SVN version.
Best regards,
Stefan
|
Ok, I tried updating my SVN working copy, but I didn't get any updates past elog rev. 2494, mxml rev. 74. I undid my changes to Makefile, tried to compile, but got the same errors.
I then pulled down elog and mxml with git, and these are working for me with no errors. Thanks!
|
SVN is obsolete and will NOT be maintained any more, since we completely switched to GIT. Actually I will disable the service soon.
|
I too am having issues installing on Mac OS X 10.9.1. I changed CFLAGS in makefile to;
CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -D_FORTIFY_SOURCE=0
I get many lines of errors like this when I run make;
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/openssl/ssl.h:1491:6: note: 'SSL_accept' declared here
int SSL_accept(SSL *ssl) DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
^
src/elogd.c:28809:19: warning: 'SSL_set_fd' is deprecated: first deprecated in OS X 10.7 [-Wdeprecated-declarations]
SSL_set_fd(ka_ssl_con[i_min], ka_sock[i_min]);
^
|
|
67651
|
Tue Jan 14 08:15:19 2014 |
| Stefan Ritt | stefan.ritt@psi.ch | Bug report | Mac OSX | 2.9.2-2494 | Re: Compilation failure on Mac OSX 10.9 |
| Ed McNichol wrote: |
|
| Stefan Ritt wrote: |
|
| A.G. Schubert wrote: |
|
| Stefan Ritt wrote: |
|
| A.G. Schubert wrote: |
|
When compiling elog on OSX 10.9 (Mavericks), I get the error below.
Elog will compile without error if I add -D_FORTIFY_SOURCE=0 to CFLAGS in Makefile, but I'm not sure whether this is a good idea.
|
All over sudden gcc comes with its own version of "strlcpy", which I had defined "manually" since many years inside ELOG. Using -DFORTIFY_SOURCE=0 will not harm, so you can use it. The "real" solution is to take our ELOG's strlcpy/strlcat, which I did on the current SVN version.
Best regards,
Stefan
|
Ok, I tried updating my SVN working copy, but I didn't get any updates past elog rev. 2494, mxml rev. 74. I undid my changes to Makefile, tried to compile, but got the same errors.
I then pulled down elog and mxml with git, and these are working for me with no errors. Thanks!
|
SVN is obsolete and will NOT be maintained any more, since we completely switched to GIT. Actually I will disable the service soon.
|
I too am having issues installing on Mac OS X 10.9.1. I changed CFLAGS in makefile to;
CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -D_FORTIFY_SOURCE=0
I get many lines of errors like this when I run make;
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/openssl/ssl.h:1491:6: note: 'SSL_accept' declared here
int SSL_accept(SSL *ssl) DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
^
src/elogd.c:28809:19: warning: 'SSL_set_fd' is deprecated: first deprecated in OS X 10.7 [-Wdeprecated-declarations]
SSL_set_fd(ka_ssl_con[i_min], ka_sock[i_min]);
^
|
If you would use the Makefile from the GIT repository there would be no errors under OS X 10.9.1:
/elog$ make
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -w -c -o crypt.o src/crypt.c
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -o elog src/elog.c crypt.o -lssl
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -w -c -o regex.o src/regex.c
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -w -c -o auth.o src/auth.c
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -c -o mxml.o ../mxml/mxml.c
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -c -o strlcpy.o ../mxml/strlcpy.c
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o strlcpy.o -lssl
cc -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -I../mxml -DHAVE_SSL -o elconv src/elconv.c -lssl
/elog$
Actually what you need is -Wno-deprecated-declarations to suppress the warnings. The open SSL functions will at some point be removed from OSX, they have their own implementation of SSL. So then we either have to ship openSSL together with elog or use Apple's implementatoin. But for now we are still fine.
/Stefan
|
|
67518
|
Fri May 31 11:41:48 2013 |
| Andreas Luedeke | andreas.luedeke@psi.ch | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Jim Tinlin wrote: |
|
| Andreas Luedeke wrote: |
|
| scogordo wrote: |
|
I've been asked to export one of our logbooks to xls or csv. Doable?
Thanks,
Scott
|
Hi Scott,
yes, every user can export entries using the "find" command.
Just select the export format in the first line
Export to:
 ⇄
Detect language » English
I often use the XML Format, but CSV is fine if you just want to import the entries to some spreadsheet program.
I was shocked to find out that this feature has not yet made it into the documentation?!? But it is that simple to use that there is not much to document.
There is even an "Import" command, to reimport entries from a file. But this is tricky to use: if you have fields of type date or datetime, then you have to convert those fields in the proper format.
|
I tried EXPORTING logbooks as .csv but have not been fully successful. Elog seems to only export the data entered for various fields with the exception of the text field.
Here is an example export from my logbook (used to track simulator problems), I would like to also export the TEXT field so it can be used by my managers in excel...but as you can see there is no entry for "TEXT" fields...
Thanks in advance!
"Message ID","Date","Author","Type","Status","Priority"
107,Thu 30 May 2013 11:28:57 -0700,"Jim Tinlin","Graphic Display","Evaluated","Low"
106,Thu 30 May 2013 10:02:24 -0700,"Jim Tinlin","Graphic Display","Identified","Low"
105,Thu 30 May 2013 08:07:27 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
104,Thu 30 May 2013 08:04:30 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
103,Wed 29 May 2013 09:36:11 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
102,Wed 29 May 2013 08:58:02 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
| Attachment 1: diff.txt
|
11645,11650d11644
< if (strieq(mode, "CSV3"))
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\" checked>");
< else
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\">");
< rsprintf("<label for=\"CSV3\">%s </label>\n", loc("CSV (\";\" separated) + Text"));
<
19535c19529
< csv = strieq(mode, "CSV1") || strieq(mode, "CSV2") || strieq(mode, "CSV3");
---
> csv = strieq(mode, "CSV1") || strieq(mode, "CSV2");
20266,20268c20260
< } else {
< if (strieq(mode, "CSV3"))
< rsprintf(";\"Text\"");
---
> } else
20270d20261
< }
20973,20987c20964
< } else {
< if (strlen(text)>0 && strieq(mode, "CSV3")) {
< rsprintf(";");
< strlcpy(str, text, sizeof(str));
< rsputs("\"");
< pt1 = str;
< while ((pt2 = strchr(pt1, '"')) != NULL) {
< *pt2 = 0;
< rsputs(pt1);
< rsputs("\"\"");
< pt1 = pt2 + 1;
< }
< rsputs(pt1);
< rsputs("\"");
< }
---
> } else
20989d20965
< }
|
|
67526
|
Tue Jun 4 12:38:01 2013 |
| Stefan Ritt | stefan.ritt@psi.ch | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Andreas Luedeke wrote: |
|
| Jim Tinlin wrote: |
|
| Andreas Luedeke wrote: |
|
| scogordo wrote: |
|
I've been asked to export one of our logbooks to xls or csv. Doable?
Thanks,
Scott
|
Hi Scott,
yes, every user can export entries using the "find" command.
Just select the export format in the first line
Export to:
⇄
Detect language » English
I often use the XML Format, but CSV is fine if you just want to import the entries to some spreadsheet program.
I was shocked to find out that this feature has not yet made it into the documentation?!? But it is that simple to use that there is not much to document.
There is even an "Import" command, to reimport entries from a file. But this is tricky to use: if you have fields of type date or datetime, then you have to convert those fields in the proper format.
|
I tried EXPORTING logbooks as .csv but have not been fully successful. Elog seems to only export the data entered for various fields with the exception of the text field.
Here is an example export from my logbook (used to track simulator problems), I would like to also export the TEXT field so it can be used by my managers in excel...but as you can see there is no entry for "TEXT" fields...
Thanks in advance!
"Message ID","Date","Author","Type","Status","Priority"
107,Thu 30 May 2013 11:28:57 -0700,"Jim Tinlin","Graphic Display","Evaluated","Low"
106,Thu 30 May 2013 10:02:24 -0700,"Jim Tinlin","Graphic Display","Identified","Low"
105,Thu 30 May 2013 08:07:27 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
104,Thu 30 May 2013 08:04:30 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
103,Wed 29 May 2013 09:36:11 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
102,Wed 29 May 2013 08:58:02 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution. |
|
67529
|
Tue Jun 4 16:17:22 2013 |
| Jim Tinlin | jim@tinlin.net | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Stefan Ritt wrote: |
|
| Andreas Luedeke wrote: |
|
| Jim Tinlin wrote: |
|
| Andreas Luedeke wrote: |
|
| scogordo wrote: |
|
I've been asked to export one of our logbooks to xls or csv. Doable?
Thanks,
Scott
|
Hi Scott,
yes, every user can export entries using the "find" command.
Just select the export format in the first line
Export to:
⇄
Detect language » English
I often use the XML Format, but CSV is fine if you just want to import the entries to some spreadsheet program.
I was shocked to find out that this feature has not yet made it into the documentation?!? But it is that simple to use that there is not much to document.
There is even an "Import" command, to reimport entries from a file. But this is tricky to use: if you have fields of type date or datetime, then you have to convert those fields in the proper format.
|
I tried EXPORTING logbooks as .csv but have not been fully successful. Elog seems to only export the data entered for various fields with the exception of the text field.
Here is an example export from my logbook (used to track simulator problems), I would like to also export the TEXT field so it can be used by my managers in excel...but as you can see there is no entry for "TEXT" fields...
Thanks in advance!
"Message ID","Date","Author","Type","Status","Priority"
107,Thu 30 May 2013 11:28:57 -0700,"Jim Tinlin","Graphic Display","Evaluated","Low"
106,Thu 30 May 2013 10:02:24 -0700,"Jim Tinlin","Graphic Display","Identified","Low"
105,Thu 30 May 2013 08:07:27 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
104,Thu 30 May 2013 08:04:30 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
103,Wed 29 May 2013 09:36:11 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
102,Wed 29 May 2013 08:58:02 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution.
|
I do not have the ability to compile a Windows executable, if someone does I'd be happy to test it out and report my results.
Thank you in advance! |
|
67545
|
Tue Jul 2 22:05:06 2013 |
| Jim Tinlin | jim@tinlin.net | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Stefan Ritt wrote: |
|
| Andreas Luedeke wrote: |
|
| Jim Tinlin wrote: |
|
| Andreas Luedeke wrote: |
|
| scogordo wrote: |
|
I've been asked to export one of our logbooks to xls or csv. Doable?
Thanks,
Scott
|
Hi Scott,
yes, every user can export entries using the "find" command.
Just select the export format in the first line
Export to:
⇄
Detect language » English
I often use the XML Format, but CSV is fine if you just want to import the entries to some spreadsheet program.
I was shocked to find out that this feature has not yet made it into the documentation?!? But it is that simple to use that there is not much to document.
There is even an "Import" command, to reimport entries from a file. But this is tricky to use: if you have fields of type date or datetime, then you have to convert those fields in the proper format.
|
I tried EXPORTING logbooks as .csv but have not been fully successful. Elog seems to only export the data entered for various fields with the exception of the text field.
Here is an example export from my logbook (used to track simulator problems), I would like to also export the TEXT field so it can be used by my managers in excel...but as you can see there is no entry for "TEXT" fields...
Thanks in advance!
"Message ID","Date","Author","Type","Status","Priority"
107,Thu 30 May 2013 11:28:57 -0700,"Jim Tinlin","Graphic Display","Evaluated","Low"
106,Thu 30 May 2013 10:02:24 -0700,"Jim Tinlin","Graphic Display","Identified","Low"
105,Thu 30 May 2013 08:07:27 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
104,Thu 30 May 2013 08:04:30 -0700,"Jim Tinlin","Problem ID","Identified","Medium"
103,Wed 29 May 2013 09:36:11 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
102,Wed 29 May 2013 08:58:02 -0700,"Jim Tinlin","Problem ID","Evaluated","High"
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution.
|
Has this been added yet?
I don't have the means to create an executable for Windows, if someone does I can give it a try...it sounds/looks like it will work.
Thanks! |
|
67546
|
Thu Jul 4 15:27:13 2013 |
| Andreas Luedeke | andreas.luedeke@psi.ch | Bug fix | All | 2.9.2-2481 | Re: Export entries to XLS or CSV? |
| Jim Tinlin wrote: |
|
| Stefan Ritt wrote: |
|
| Andreas Luedeke wrote: |
|
Yes, you're right: the text field is only exported in XML and Raw mode.
It is questionable how EXCEL should cope with HTML or ELCode output from the text fields.
But I admit that this would be a useful feature for logbooks that only use plain text entries. And it is simple to implement.
I've attached a patch to elogd.c from elog-2.9.2-2081 that adds a third CVS mode 'CSV (";" separated) + Text'.
(This string has not yet been added to the localization.)
As far as I've tested it works fine to import the text to OpenOffice and EXCEL, even with multiple text lines and HTML code in the text.
Of course the spreadsheet programs just display the HTML source.
Stefan, do you think this should be added to the official branch?
⇄
Detect language » English
⇄
Detect language » English
|
Hi Jim, can you confirm that this works for you? If so, I'm willing to incorporate the patch into the distribution.
|
Has this been added yet?
I don't have the means to create an executable for Windows, if someone does I can give it a try...it sounds/looks like it will work.
Thanks!
|
Hi Jim, I've incorporated the patch to our production server about a week ago.
I've agreed with Stefan that he'll add it, when it proved to run stable for a while.
Until now it appears to work fine. I think Stefan will add it to the distribution soon.
But I won't touch any Windows systems, you'll need to wait for someone else to compile it for you.
Maybe some skilled Windows user want to give it a try: i've attached the changes in the elogd.c file from v2.9.2-2481,
the modified file can be currently downloaded from http://people.web.psi.ch/luedeke/public/tmp/elogd.c
⇄
Detect language » English
Andreas
⇄
Detect language » English
⇄
Detect language » English
⇄
Detect language » English
|
| Attachment 1: elog-2.9.2-2481_cvs3patch.diff
|
11597c11597
< rsprintf("<tr><td class=\"form1\"><table><tr><td valign=\"top\" class=\"form1\">\n");
---
> rsprintf("<tr><td class=\"form1\">\n");
11599c11599
< rsprintf("<b>%s:</b>
", loc("Mode"));
---
> rsprintf("<b>%s:</b> ", loc("Mode"));
11609c11609
< rsprintf("<label for=\"full\">%s </label>
\n", loc("Display full entries"));
---
> rsprintf("<label for=\"full\">%s </label>\n", loc("Display full entries"));
11615c11615
< rsprintf("<label for=\"summary\">%s </label>
\n", loc("Summary only"));
---
> rsprintf("<label for=\"summary\">%s </label>\n", loc("Summary only"));
11622c11622
< rsprintf("<label for=\"summary\">%s </label>
\n", loc("Summary"));
---
> rsprintf("<label for=\"summary\">%s </label>\n", loc("Summary"));
11631c11631
< rsprintf("</td><td valign=\"top\" class=\"form1\"><b>%s:</b>
", loc("Export to"));
---
> rsprintf("<b>%s:</b> ", loc("Export to"));
11637c11637
< rsprintf("<label for=\"CSV1\">%s </label>
\n", loc("CSV (\",\" separated)"));
---
> rsprintf("<label for=\"CSV1\">%s </label>\n", loc("CSV (\",\" separated)"));
11643,11649c11643
< rsprintf("<label for=\"CSV2\">%s </label>
\n", loc("CSV (\";\" separated)"));
<
< if (strieq(mode, "CSV3"))
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\" checked>");
< else
< rsprintf("<input type=radio id=\"CSV3\" name=\"mode\" value=\"CSV3\">");
< rsprintf("<label for=\"CSV3\">%s </label>
\n", loc("CSV (\";\" separated) + Text"));
---
> rsprintf("<label for=\"CSV2\">%s </label>\n", loc("CSV (\";\" separated)"));
11655c11649
< rsprintf("<label for=\"XML\">XML </label>
\n");
---
> rsprintf("<label for=\"XML\">XML </label>\n");
11661c11655
< rsprintf("<label for=\"Raw\">Raw </label>
\n");
---
> rsprintf("<label for=\"Raw\">Raw </label>\n");
11663c11657
< rsprintf("</td>\n");
---
> rsprintf("</td></tr>\n");
11665c11659
< rsprintf("<td valign=\"top\" class=\"form2\"><b>%s:</b>
", loc("Options"));
---
> rsprintf("<tr><td class=\"form2\"><b>%s:</b>
", loc("Options"));
11707c11701
< rsprintf("</td></tr></table></td></tr>\n");
---
> rsprintf("</td></tr>\n");
19535c19529
< csv = strieq(mode, "CSV1") || strieq(mode, "CSV2") || strieq(mode, "CSV3");
---
> csv = strieq(mode, "CSV1") || strieq(mode, "CSV2");
20266,20268c20260
< } else {
< if (strieq(mode, "CSV3"))
< rsprintf(";\"Text\"");
---
> } else
20270d20261
< }
20973,20987c20964
< } else {
< if (strlen(text)>0 && strieq(mode, "CSV3")) {
< rsprintf(";");
< strlcpy(str, text, sizeof(str));
< rsputs("\"");
< pt1 = str;
< while ((pt2 = strchr(pt1, '"')) != NULL) {
< *pt2 = 0;
< rsputs(pt1);
< rsputs("\"\"");
< pt1 = pt2 + 1;
< }
< rsputs(pt1);
< rsputs("\"");
< }
---
> } else
20989d20965
< }
|
|