]> Nishi Git Mirror - clover.git/commitdiff
projects / clover.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 012288d)
fix liinks
authornishi <nishi@cc13bd98-b292-b64a-ad22-c0789b689ca7>
Sun, 5 May 2024 07:44:27 +0000 (07:44 +0000)
committernishi <nishi@cc13bd98-b292-b64a-ad22-c0789b689ca7>
Sun, 5 May 2024 07:44:27 +0000 (07:44 +0000)
git-svn-id: file:///raid/svn-main/nishi-clover/trunk@8 cc13bd98-b292-b64a-ad22-c0789b689ca7

clover.c patch | blob | history

diff --git a/clover.c b/clover.c
index d323e8ecddcbc5df6f2d9c5b46972009f3934add..9130933e8630b9225c8891a5f48bff89397adc01 100644 (file)
--- a/clover.c
+++ b/clover.c
@@ -153,6 +153,7 @@ char* page_data;
 char* page_icon;
 char* page_shortdesc;
 bool page_index;
+bool page_do_not_index;
 
 char* page_title2;
 char* page_data2;
@@ -169,6 +170,7 @@ static void XMLCALL xml_startelem(void* user_data, const XML_Char* el, const XML
        if(strcmp(el, "icon") == 0) typearr[depth] = ELEM_ICON;
        if(strcmp(el, "short-description") == 0) typearr[depth] = ELEM_SHORTDESC;
        if(strcmp(el, "index") == 0) page_index = true;
+       if(strcmp(el, "do-not-index") == 0) page_do_not_index = true;
        if(depth == 0 && typearr[depth] != ELEM_METADATA) {
                fprintf(stderr, "toplevel must be metadata\n");
                exit(1);
@@ -319,7 +321,7 @@ void scan_and_print(FILE* f, const char* path, const char* http){
                                        XML_ParserFree(sparser);
                                        if(!page_do_not_index2){
                                                fprintf(f, "<dt><a href=\"%s%s\">", http_path, http);
-                                               if(page_icon2 != NULL) fprintf(f, "<img src=\"/static/%s\">", page_icon2);
+                                               if(page_icon2 != NULL) fprintf(f, "<img src=\"%s/static/%s\">", http_path, page_icon2);
                                                if(page_icon2 != NULL) fprintf(f, "</a> ");
                                                if(page_title2 != NULL) fprintf(f, "<b>%s </b>", page_title2);
                                                if(page_icon2 == NULL) fprintf(f, "</a>");
@@ -385,10 +387,10 @@ int parse_xml(const char* xml, const char* outdir) {
                } else {
                        fprintf(f, "            <title>%s</title>\n", title);
                }
-               fprintf(f, "            <link rel=\"icon\" href=\"/static/%s\">\n", icon);
+               fprintf(f, "            <link rel=\"icon\" href=\"%s/static/%s\">\n", http_path, icon);
                fprintf(f, "    </head>\n");
                fprintf(f, "    <body>\n");
-               fprintf(f, "            <a href=\"%s\"><img src=\"/static/%s\"></a>\n", http_path, icon);
+               fprintf(f, "            <a href=\"%s\"><img src=\"%s/static/%s\"></a>\n", http_path, http_path, icon);
                if(page_icon != NULL){
                        char* from_path = concat3_str(static_dir, "/", page_icon);
                        char* to_path = concat3_str(output_dir, "/static/", page_icon);
HTML 2.0 compliant static site generator