Fossil: Check-in [f2181f5e45]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	f2181f5e45b62da9c11fc6258f555593ef7b2b6c
Date:	2010-03-15 14:46:20
User:	drh
Comment:	Add the BACKLINK table and code to populate it. NB: Run "rebuild" when updating to this or later versions.

Tags And Properties

branch=trunk inherited from [a28c83647d]
sym-trunk inherited from [a28c83647d]

Changes

hide diffs unified diffs patch

Changes to src/manifest.c

--- Old (fbdeafd71ccbf7f9)
+++ New (04b8bfbf43e39d8c)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
     return 0;
+  }
   db_begin_transaction();
   if( m.type==CFTYPE_MANIFEST ){
     if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
+      char *zCom;
       for(i=0; i<m.nParent; i++){
         int pid = uuid_to_rid(m.azParent[i], 1);
         db_multi_exec("INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
                       "VALUES(%d, %d, %d, %.17g)", pid, rid, i==0, m.rDate);
         if( i==0 ){
         rid, m.zUser, m.zComment,
         TAG_BGCOLOR, rid,
         TAG_USER, rid,
         TAG_COMMENT, rid
       );
+      zCom = db_text(0, "SELECT coalesce(ecomment, comment) FROM event"
+                        " WHERE rowid=last_insert_rowid()");
+      wiki_extract_links(zCom, rid, 0, m.rDate, 1, WIKI_INLINE);
+      free(zCom);
+    }
+  }
   if( m.type==CFTYPE_CLUSTER ){
     tag_insert("cluster", 1, 0, rid, m.rDate, rid);
     for(i=0; i<m.nCChild; i++){
+  }
   db_end_transaction(0);
   manifest_clear(&m);
   return 1;
+}

Changes to src/schema.c

--- Old (4a9ad582dd3cedf6)
+++ New (51060ed8449af1e4)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
 @   mtime TIMESTAMP,                -- Time of addition or removal
 @   rid INTEGER REFERENCE blob,     -- Artifact tag is applied to
 @   UNIQUE(rid, tagid)
 @ );
 @ CREATE INDEX tagxref_i1 ON tagxref(tagid, mtime);
+@
+@ -- When a hyperlink occurs from one artifact to another (for example
+@ -- when a check-in comment refers to a ticket) an entry is made in
+@ -- the following table for that hyperlink.  This table is used to
+@ -- facilitate the display of "back links".
+@ --
+@ CREATE TABLE backlink(
+@   target TEXT,           -- Where the hyperlink points to
+@   srctype INT,           -- 0: check-in  1: ticket  2: wiki
+@   srcid INT,             -- rid for checkin or wiki.  tkt_id for ticket.
+@   mtime TIMESTAMP,       -- time that the hyperlink was added
+@   UNIQUE(target, srctype, srcid)
+@ );
+@ CREATE INDEX backlink_src ON backlink(srcid, srctype);
+@
 @ -- Template for the TICKET table
 @ --
 @ -- NB: when changing the schema of the TICKET table here, also make the
 @ -- same change in tktsetup.c.
 @   merge INTEGER,                    -- Merged with this record
 @   UNIQUE(id, merge)
 @ );
+@
+;

Changes to src/tag.c

--- Old (53f57645df2929e4)
+++ New (8853a08ab87062e0)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
       break;
+    }
+  }
   if( zCol ){
     db_multi_exec("UPDATE event SET %s=%Q WHERE objid=%d", zCol, zValue, rid);
+    if( tagid==TAG_COMMENT ){
+      char *zCopy = mprintf("%s", zValue);
+      wiki_extract_links(zCopy, rid, 0, mtime, 1, WIKI_INLINE);
+      free(zCopy);
+    }
+  }
   if( tagid==TAG_DATE ){
     db_multi_exec("UPDATE event SET mtime=julianday(%Q) WHERE objid=%d",
                   zValue, rid);
+  }
   @ function xout(id){
   @ }
   @ </script>
   style_footer();
+}

Changes to src/wikiformat.c

--- Old (79b7ccbe45fd5ca2)
+++ New (0a705ae0570c458a)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
 ** Parse only Wiki links, return everything else as TOKEN_RAW.
 **
 ** z points to the start of a token.  Return the number of
 ** characters in that token. Write the token type into *pTokenType.
 */
@@ 625 / < @@
 static int nextRawToken(const char *z, Renderer *p, int *pTokenType){
   int n;
   if( z[0]=='[' && (n = linkLength(z))>0 ){
     *pTokenType = TOKEN_LINK;
     return n;
 static void popStack(Renderer *p){
   if( p->nStack ){
     int iCode;
     p->nStack--;
     iCode = p->aStack[p->nStack].iCode;
-    if( iCode!=MARKUP_DIV ){
+    if( iCode!=MARKUP_DIV && p->pOut ){
       blob_appendf(p->pOut, "</%s>", aMarkup[iCode].zName);
+    }
+  }
+}
   for(i=iStart; z[i] && (z[i]!='<' || strncmp(&z[i],"</title>",8)!=0); i++){}
   if( z[i]!='<' ) return 0;
   blob_init(pTitle, &z[iStart], i-iStart);
   blob_init(pTail, &z[i+8], -1);
   return 1;
+}
@@ > / 1451 @@
+/*
+** Parse text looking for wiki hyperlinks in one of the formats:
+**
+**       [target]
+**       [target|...]
+**
+** Where "target" can be either an artifact ID prefix or a wiki page
+** name.  For each such hyperlink found, add an entry to the
+** backlink table.
+*/
+void wiki_extract_links(
+  char *z,           /* The wiki text from which to extract links */
+  int srcid,         /* srcid field for new BACKLINK table entries */
+  int srctype,       /* srctype field for new BACKLINK table entries */
+  double mtime,      /* mtime field for new BACKLINK table entries */
+  int replaceFlag,   /* True first delete prior BACKLINK entries */
+  int flags          /* wiki parsing flags */
+){
+  Renderer renderer;
+  int tokenType;
+  ParsedMarkup markup;
+  int n;
+  int inlineOnly;
+  int wikiUseHtml = 0;
@@ > / 1476 @@
+  memset(&renderer, 0, sizeof(renderer));
+  renderer.state = ALLOW_WIKI|AT_NEWLINE|AT_PARAGRAPH;
+  if( flags & WIKI_NOBLOCK ){
+    renderer.state |= INLINE_MARKUP_ONLY;
+  }
+  if( db_get_int("wiki-use-html", 0) ){
+    renderer.state |= WIKI_USE_HTML;
+    wikiUseHtml = 1;
+  }
+  inlineOnly = (renderer.state & INLINE_MARKUP_ONLY)!=0;
+  if( replaceFlag ){
+    db_multi_exec("DELETE FROM backlink WHERE srctype=%d AND srcid=%d",
+                  srctype, srcid);
+  }
@@ > / 1491 @@
+  while( z[0] ){
+    if( wikiUseHtml ){
+      n = nextRawToken(z, &renderer, &tokenType);
+    }else{
+      n = nextWikiToken(z, &renderer, &tokenType);
+    }
+    switch( tokenType ){
+      case TOKEN_LINK: {
+        char *zTarget;
+        int i, c;
+        char zLink[42];
@@ > / 1503 @@
+        zTarget = &z[1];
+        for(i=0; zTarget[i] && zTarget[i]!='|' && zTarget[i]!=']'; i++){}
+        while(i>1 && zTarget[i-1]==' '){ i--; }
+        c = zTarget[i];
+        zTarget[i] = 0;
+        if( is_valid_uuid(zTarget) ){
+          memcpy(zLink, zTarget, i+1);
+          canonical16(zLink, i);
+          db_multi_exec(
+             "REPLACE INTO backlink(target,srctype,srcid,mtime)"
+             "VALUES(%Q,%d,%d,%g)", zLink, srctype, srcid, mtime
+          );
+        }
+        zTarget[i] = c;
+        break;
+      }
+      case TOKEN_MARKUP: {
+        const char *zId;
+        int iDiv;
+        parseMarkup(&markup, z);
@@ > / 1524 @@
+        /* Markup of the form </div id=ID> where there is a matching
+        ** ID somewhere on the stack.  Exit the verbatim if were are in
+        ** it.  Pop the stack up to the matching <div>.  Discard the
+        ** </div>
+        */
+        if( markup.iCode==MARKUP_DIV && markup.endTag &&
+             (zId = markupId(&markup))!=0 &&
+             (iDiv = findTagWithId(&renderer, MARKUP_DIV, zId))>=0
+        ){
+          if( renderer.inVerbatim ){
+            renderer.inVerbatim = 0;
+            renderer.state = renderer.preVerbState;
+          }
+          while( renderer.nStack>iDiv+1 ) popStack(&renderer);
+          if( renderer.aStack[iDiv].allowWiki ){
+            renderer.state |= ALLOW_WIKI;
+          }else{
+            renderer.state &= ~ALLOW_WIKI;
+          }
+          renderer.nStack--;
+        }else
@@ > / 1546 @@
+        /* If within <verbatim id=ID> ignore everything other than
+        ** </verbatim id=ID> and the </dev id=ID2> above.
+        */
+        if( renderer.inVerbatim ){
+          if( endVerbatim(&renderer, &markup) ){
+            renderer.inVerbatim = 0;
+            renderer.state = renderer.preVerbState;
+          }else{
+            n = 1;
+          }
+        }else
@@ > / 1558 @@
+        /* Render invalid markup literally.  The markup appears in the
+        ** final output as plain text.
+        */
+        if( markup.iCode==MARKUP_INVALID ){
+          n = 1;
+        }else
@@ > / 1565 @@
+        /* If the markup is not font-change markup ignore it if the
+        ** font-change-only flag is set.
+        */
+        if( (markup.iType&MUTYPE_FONT)==0 &&
+                            (renderer.state & FONT_MARKUP_ONLY)!=0 ){
+          /* Do nothing */
+        }else
@@ > / 1573 @@
+        if( markup.iCode==MARKUP_NOWIKI ){
+          if( markup.endTag ){
+            renderer.state |= ALLOW_WIKI;
+          }else{
+            renderer.state &= ~ALLOW_WIKI;
+          }
+        }else
@@ > / 1581 @@
+        /* Ignore block markup for in-line rendering.
+        */
+        if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
+          /* Do nothing */
+        }else
@@ > / 1587 @@
+        /* Generate end-tags */
+        if( markup.endTag ){
+          popStackToTag(&renderer, markup.iCode);
+        }else
@@ > / 1592 @@
+        /* Push <div> markup onto the stack together with the id=ID attribute.
+        */
+        if( markup.iCode==MARKUP_DIV ){
+          pushStackWithId(&renderer, markup.iCode, markupId(&markup),
+                          (renderer.state & ALLOW_WIKI)!=0);
+        }else
@@ > / 1599 @@
+        /* Enter <verbatim> processing.  With verbatim enabled, all other
+        ** markup other than the corresponding end-tag with the same ID is
+        ** ignored.
+        */
+        if( markup.iCode==MARKUP_VERBATIM ){
+          int vAttrIdx, vAttrDidAppend=0;
+          renderer.zVerbatimId = 0;
+          renderer.inVerbatim = 1;
+          renderer.preVerbState = renderer.state;
+          renderer.state &= ~ALLOW_WIKI;
+          for (vAttrIdx = 0; vAttrIdx < markup.nAttr; vAttrIdx++){
+            if( markup.aAttr[vAttrIdx].iACode == ATTR_ID ){
+              renderer.zVerbatimId = markup.aAttr[0].zValue;
+            }else if( markup.aAttr[vAttrIdx].iACode == ATTR_TYPE ){
+              vAttrDidAppend=1;
+            }
+          }
+          renderer.wantAutoParagraph = 0;
+        }
@@ > / 1619 @@
+        /* Restore the input text to its original configuration
+        */
+        unparseMarkup(&markup);
+        break;
+      }
+      default: {
+        break;
+      }
+    }
+    z += n;
+  }
+}