mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing dive notes escape characters in worldmap exporter

Browse source 
Replacing the newlines in the string with <br> and changing the
single quote to its HTML number.

Also minor coding style updates to previous commit.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad 2014-04-03 21:00:13 +02:00 • committed by Dirk Hohndel
parent 3485c6c260
commit c268b757df
1 changed files with 79 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

111
worldmap-save.c
View file

@ -7,13 +7,13 @@
#include "worldmap-save.h" #include "worldmap-save.h"
#include "worldmap-options.h" #include "worldmap-options.h"
char* getGoogleApi() char *getGoogleApi()
{ {
/* google maps api auth*/ /* google maps api auth*/
return "https://maps.googleapis.com/maps/api/js?key=AIzaSyDzo9PWsqYDDSddVswg_13rpD9oH_dLuoQ"; return "https://maps.googleapis.com/maps/api/js?key=AIzaSyDzo9PWsqYDDSddVswg_13rpD9oH_dLuoQ";
} }
void put_HTML_date(struct membuffer *b,struct dive *dive) void put_HTML_date(struct membuffer *b, struct dive *dive)
{ {
struct tm tm; struct tm tm;
utc_mkdate(dive->when, &tm); utc_mkdate(dive->when, &tm);
@ -21,16 +21,65 @@ void put_HTML_date(struct membuffer *b,struct dive *dive)
put_format(b, "<p>time=%02u:%02u:%02u</p>",tm.tm_hour, tm.tm_min, tm.tm_sec); put_format(b, "<p>time=%02u:%02u:%02u</p>",tm.tm_hour, tm.tm_min, tm.tm_sec);
} }
void put_HTML_temp(struct membuffer *b,struct dive *dive) void put_HTML_temp(struct membuffer *b, struct dive *dive)
{ {
put_temperature(b, dive->airtemp, "<p>Air Temp: ", " C\\'</p>"); put_temperature(b, dive->airtemp, "<p>Air Temp: ", " C\\'</p>");
put_temperature(b, dive->watertemp, "<p>Water Temp: ", " C\\'</p>"); put_temperature(b, dive->watertemp, "<p>Water Temp: ", " C\\'</p>");
} }
void put_HTML_notes(struct membuffer *b,struct dive *dive) char *replace_char(char *str, char replace, char *replace_by)
{
/*
this fumction can't replace a character with a substring
where the substring contains the character, infinte loop.
*/
if (!str)
return 0;
int i = 0, char_count = 0, new_size;
while (str[i] != '\0') {
if (str[i] == replace)
char_count++;
i++;
}
new_size = strlen(str) + char_count * strlen(replace_by) + 1;
char *result = malloc(new_size);
char *temp = strdup(str);
char *p0, *p1;
if (!result || !temp)
return 0;
result[0] = '\0';
p0 = temp;
p1 = strchr(temp, replace);
while (p1) {
*p1 = '\0';
strcat(result, p0);
strcat(result, replace_by);
p0 = p1 + 1;
p1 = strchr(p0, replace);
}
strcat(result, p0); /*concat the rest of the string*/
free(temp);
return result;
}
char *quote(char *string)
{
char *new_line_removed = replace_char(string, '\n', "<br>");
char *single_quotes_removed = replace_char(new_line_removed, '\'', "&#39;");
free(new_line_removed);
return single_quotes_removed;
}
void put_HTML_notes(struct membuffer *b, struct dive *dive)
{ {
if (dive->notes) { if (dive->notes) {
put_format(b,"<p>Notes : %s </p>",dive->notes); char *notes = quote(dive->notes);
put_format(b,"<p>Notes : %s </p>", notes);
free(notes);
} }
} }
@ -42,20 +91,19 @@ void writeMarkers(struct membuffer *b)
for_each_dive(i, dive) { for_each_dive(i, dive) {
/*export selected dives only ?*/ /*export selected dives only ?*/
if (dive->latitude.udeg==0 && dive->longitude.udeg==0) { if (dive->latitude.udeg == 0 && dive->longitude.udeg == 0)
continue; continue;
}
put_format(b,"temp = new google.maps.Marker({position: new google.maps.LatLng(%f,%f)});\n", put_format(b, "temp = new google.maps.Marker({position: new google.maps.LatLng(%f,%f)});\n",
dive->latitude.udeg/1000000.0,dive->longitude.udeg/1000000.0); dive->latitude.udeg/1000000.0, dive->longitude.udeg/1000000.0);
put_string(b,"markers.push(temp);\ntempinfowindow = new google.maps.InfoWindow({content: '<div id=\"content\">'+'<div id=\"siteNotice\">'+'</div>'+'<div id=\"bodyContent\">"); put_string(b, "markers.push(temp);\ntempinfowindow = new google.maps.InfoWindow({content: '<div id=\"content\">'+'<div id=\"siteNotice\">'+'</div>'+'<div id=\"bodyContent\">");
put_HTML_date(b,dive); put_HTML_date(b, dive);
put_duration(b, dive->duration, "<p>duration=", " min</p>"); put_duration(b, dive->duration, "<p>duration=", " min</p>");
put_HTML_temp(b,dive); put_HTML_temp(b, dive);
put_HTML_notes(b,dive); put_HTML_notes(b, dive);
put_string(b,"</p>'+'</div>'+'</div>'});\ninfowindows.push(tempinfowindow);\n"); put_string(b, "</p>'+'</div>'+'</div>'});\ninfowindows.push(tempinfowindow);\n");
put_format(b,"google.maps.event.addListener(markers[%d], 'mouseover', function() {\ninfowindows[%d].open(map,markers[%d]);}",i,i,i); put_format(b, "google.maps.event.addListener(markers[%d], 'mouseover', function() {\ninfowindows[%d].open(map,markers[%d]);}", i, i, i);
put_format(b,");google.maps.event.addListener(markers[%d], 'mouseout', function() {\ninfowindows[%d].close();});\n",i,i); put_format(b, ");google.maps.event.addListener(markers[%d], 'mouseout', function() {\ninfowindows[%d].close();});\n", i, i);
} }
} }
@ -67,21 +115,21 @@ void insert_html_header(struct membuffer *b)
void insert_css(struct membuffer *b) void insert_css(struct membuffer *b)
{ {
put_format(b,"<style type=\"text/css\">%s</style>\n",css); put_format(b, "<style type=\"text/css\">%s</style>\n", css);
} }
void insert_javascript(struct membuffer *b) void insert_javascript(struct membuffer *b)
{ {
put_string(b,"<script type=\"text/javascript\"src=\""); put_string(b, "<script type=\"text/javascript\"src=\"");
put_string(b,getGoogleApi()); put_string(b, getGoogleApi());
put_string(b,"&sensor=false\">\n</script>\n<script type=\"text/javascript\">\nvar map;\n"); put_string(b, "&sensor=false\">\n</script>\n<script type=\"text/javascript\">\nvar map;\n");
put_format(b,"function initialize() {\nvar mapOptions = {\n\t%s,",map_options); put_format(b, "function initialize() {\nvar mapOptions = {\n\t%s,", map_options);
put_string(b,"rotateControl: false,\n\tstreetViewControl: false,\n\tmapTypeControl: false\n};\n"); put_string(b, "rotateControl: false,\n\tstreetViewControl: false,\n\tmapTypeControl: false\n};\n");
put_string(b,"map = new google.maps.Map(document.getElementById(\"map-canvas\"),mapOptions);\nvar markers = new Array();"); put_string(b, "map = new google.maps.Map(document.getElementById(\"map-canvas\"),mapOptions);\nvar markers = new Array();");
put_string(b,"\nvar infowindows = new Array();\nvar temp;\nvar tempinfowindow;\n"); put_string(b, "\nvar infowindows = new Array();\nvar temp;\nvar tempinfowindow;\n");
writeMarkers(b); writeMarkers(b);
put_string(b,"\nfor(var i=0;i<markers.length;i++)\n\tmarkers[i].setMap(map);\n}\n"); put_string(b, "\nfor(var i=0;i<markers.length;i++)\n\tmarkers[i].setMap(map);\n}\n");
put_string(b,"google.maps.event.addDomListener(window, 'load', initialize);</script>\n"); put_string(b, "google.maps.event.addDomListener(window, 'load', initialize);</script>\n");
} }
void export(struct membuffer *b) void export(struct membuffer *b)
@ -89,22 +137,21 @@ void export(struct membuffer *b)
insert_html_header(b); insert_html_header(b);
insert_css(b); insert_css(b);
insert_javascript(b); insert_javascript(b);
put_string(b,"\t</head>\n<body>\n<div id=\"map-canvas\"/>\n</body>\n</html>"); put_string(b, "\t</head>\n<body>\n<div id=\"map-canvas\"/>\n</body>\n</html>");
} }
void export_worldmap_HTML(const char* file_name) void export_worldmap_HTML(const char *file_name)
{ {
FILE *f; FILE *f;
struct membuffer buf = { 0 }; struct membuffer buf = { 0 };
export(&buf); export(&buf);
f = fopen(file_name,"w+"); f = fopen(file_name, "w+");
if (!f) { if (!f)
printf("error"); /*report error*/ printf("error"); /*report error*/
}
flush_buffer(&buf,f); /*check for writing errors? */ flush_buffer(&buf, f); /*check for writing errors? */
free_buffer(&buf); free_buffer(&buf);
fclose(f); fclose(f);
} }