[Teem-commit] teem/src/bin talkweb.c,1.3,1.4

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv14867

Modified Files:
	talkweb.c 
Log Message:
changed slide numbering to start at 1

Index: talkweb.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/talkweb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** talkweb.c	11 Nov 2003 23:28:38 -0000	1.3
--- talkweb.c	13 Nov 2003 03:35:50 -0000	1.4
***************
*** 183,188 ****
      }
      slide[slideIdx] = tkwbSlideNew(title, image, text);
-     fprintf(stderr, "!%s: slide[%d] = %p = (%s,%s,...)\n",
- 	    me, slideIdx, slide[slideIdx], title, image);
      AIR_FREE(title);
      AIR_FREE(image);
--- 183,186 ----
***************
*** 314,318 ****
    for (si=0; slide[si]; si++) {
      sprintf(tmp, "<li> <a href=\"slide%03d.html\">%s</a>\n", 
! 	    si, slide[si]->title);
      strcat(repl, tmp);
    }
--- 312,316 ----
    for (si=0; slide[si]; si++) {
      sprintf(tmp, "<li> <a href=\"slide%03d.html\">%s</a>\n", 
! 	    si+1, slide[si]->title);
      strcat(repl, tmp);
    }
***************
*** 341,346 ****
  
    mop = airMopNew();
!   sprintf(frst, "<a href=\"slide000.html\">%s</a>", link[0]);
!   sprintf(last, "<a href=\"slide%03d.html\">%s</a>", numSlides-1, link[3]);
    for (si=0; si<numSlides; si++) {
      text = airStrdup(tmpl);
--- 339,344 ----
  
    mop = airMopNew();
!   sprintf(frst, "<a href=\"slide001.html\">%s</a>", link[0]);
!   sprintf(last, "<a href=\"slide%03d.html\">%s</a>", numSlides, link[3]);
    for (si=0; si<numSlides; si++) {
      text = airStrdup(tmpl);
***************
*** 350,363 ****
      if (si) {
        tkwbStringSubst(&text, tag[TKWB_TAG_FIRST], frst);
!       sprintf(prev, "<a href=\"slide%03d.html\">%s</a>", si-1, link[1]);
        tkwbStringSubst(&text, tag[TKWB_TAG_PREV], prev);
      }
      if (si < numSlides-1) {
        tkwbStringSubst(&text, tag[TKWB_TAG_LAST], last);
!       sprintf(next, "<a href=\"slide%03d.html\">%s</a>", si+1, link[2]);
        tkwbStringSubst(&text, tag[TKWB_TAG_NEXT], next);
      }
      airMopAdd(mop, text, airFree, airMopAlways);
!     sprintf(name, "slide%03d.html", si);
      if (tkwbWriteStringToFile(name, text)) {
        sprintf(err, "%s: couldn't write \"%s\"", me, name);
--- 348,361 ----
      if (si) {
        tkwbStringSubst(&text, tag[TKWB_TAG_FIRST], frst);
!       sprintf(prev, "<a href=\"slide%03d.html\">%s</a>", si, link[1]);
        tkwbStringSubst(&text, tag[TKWB_TAG_PREV], prev);
      }
      if (si < numSlides-1) {
        tkwbStringSubst(&text, tag[TKWB_TAG_LAST], last);
!       sprintf(next, "<a href=\"slide%03d.html\">%s</a>", si+2, link[2]);
        tkwbStringSubst(&text, tag[TKWB_TAG_NEXT], next);
      }
      airMopAdd(mop, text, airFree, airMopAlways);
!     sprintf(name, "slide%03d.html", si+1);
      if (tkwbWriteStringToFile(name, text)) {
        sprintf(err, "%s: couldn't write \"%s\"", me, name);
***************
*** 379,383 ****
    int numSlides;
    
-   fprintf(stderr, "!%s: bingo\n", me);
    mop = airMopNew();
    if (tkwbReadTemplate(&index, indexS)) {
--- 377,380 ----
***************
*** 387,391 ****
    airMopAdd(mop, index, airFree, airMopAlways);
  
-   fprintf(stderr, "!%s: bingo\n", me);
    if (tkwbReadTemplate(&tmpl, tmplS)) {
      sprintf(err, "%s: trouble reading in slide template file", me);
--- 384,387 ----
***************
*** 394,398 ****
    airMopAdd(mop, tmpl, airFree, airMopAlways);
  
-   fprintf(stderr, "!%s: bingo\n", me);
    if (tkwbReadSlides(&slide, scriptS, mop)) {
      sprintf(err, "%s: trouble reading in slide script", me);
--- 390,393 ----
***************
*** 401,405 ****
    airMopAdd(mop, slide, airFree, airMopAlways);
    
-   fprintf(stderr, "!%s: bingo\n", me);
    if (tkwbExpandImageInfo(slide)) {
      sprintf(err, "%s: trouble learning details of images", me);
--- 396,399 ----
***************
*** 407,411 ****
    }
  
-   fprintf(stderr, "!%s: bingo\n", me);
    if (tkwbWriteIndex(index, slide, tag)) {
      sprintf(err, "%s: trouble writing index.html", me);
--- 401,404 ----
***************
*** 413,417 ****
    }
    
-   fprintf(stderr, "!%s: bingo\n", me);
    for (numSlides=0; slide[numSlides]; numSlides++);
    if (tkwbWriteSlides(slide, numSlides, tmpl, tag, link)) {
--- 406,409 ----
***************
*** 420,424 ****
    }
    
-   fprintf(stderr, "!%s: bingo\n", me);
    airMopOkay(mop);
    return 0;
--- 412,415 ----