Removed comments, renamed files

Author: singingwolfboy

apply.sql renamed to diff.sql

@@ -20,10 +20,10 @@ declare
 begin
     SELECT * INTO latest FROM page_latest WHERE id = page_id;
     IF NOT FOUND THEN
-        RAISE notice 'Page % not found', id;
+        RAISE 'Page % not found', id;
     END IF;
     new_revision := latest.revision + 1;
-    raise notice 'new revision: %', new_revision;
+    --raise notice 'new revision: %', new_revision;
     -- write out new diff object
     INSERT INTO page_diff (page_id, revision, editor, comment)
         VALUES (page_id, latest.revision, latest.editor, latest.comment);
@@ -33,21 +33,21 @@ begin
     i := array_length(X, 1) + 1;
     j := array_length(Y, 1) + 1;
     --hunk_start := i;
-    raise notice 'Determining longest common substring table...';
     C := lcs_length(X, Y);
-    raise notice 'Longest common substring table determined.';
-    raise notice 'context_len = %', context_len;
     LOOP -- moving backwards
-        raise notice 'i = %, j = %', i, j;
-        raise notice 'hunk = %', hunk;
-        raise notice 'context here = %', context;
+        --raise notice 'i = %, j = %', i, j;
+        --raise notice 'hunk = %', hunk;
+        --raise notice 'context here = %', context;
         if i = 1 or j = 1 then
             -- we're done!
             IF in_hunk THEN
                 context_length := array_length(context, 1);
                 IF context_length IS NOT NULL THEN
                     IF context_length > context_len THEN
-                        context := context[1:context_len];
+                        --raise notice 'context before = %', context;
+                        --raise notice '% %', context_length-context_len+1, context_length;
+                        context := context[context_length-context_len+1:context_length];
+                        --raise notice 'context after = %', context;
                         context_length = context_len;
                     END IF;
                     -- prepend context to hunk
@@ -70,11 +70,11 @@ begin
         end if;
         Xline := X[i-1];
         Yline := Y[j-1];
-        raise notice 'Xline = %', Xline;
-        raise notice 'Yline = %', Yline;
+        --raise notice 'Xline = %', Xline;
+        --raise notice 'Yline = %', Yline;
         -- handle same line
         if Xline = Yline THEN
-            raise notice 'equal lines: %, %', Xline, Yline;
+            --raise notice 'equal lines: %, %', Xline, Yline;
             IF NOT in_hunk THEN
                 -- LIFO queue
                 IF array_length(context, 1) < context_len THEN
@@ -83,13 +83,12 @@ begin
                     -- hunk_lines_context := hunk_lines_context + 1;
                 ELSE
                     -- pull the last one off before you stick the new one in front
-                    raise notice 'sliced context = %', context[1:context_len-1];
+                    --raise notice 'sliced context = %', context[1:context_len-1];
                     context := (' ' || Xline) || context[1:context_len-1];
                 END IF;
             ELSE
                 context := (' ' || Xline) || context;
-                raise notice 'context whoa = %', context;
-                -- hunk_lines_context := hunk_lines_context + 1;
+                --raise notice 'context whoa = %', context;
                 -- are we done with this hunk?
                 -- we need to check up until twice the context_len, because of
                 -- pathological splitting case
@@ -118,7 +117,7 @@ begin
         end if;
         -- reset context array
         context_length := array_length(context, 1);
-        raise notice 'context there = %', context;
+        --raise notice 'context there = %', context;
         IF NOT in_hunk THEN
             -- start a new hunk
             hunk = context;
@@ -136,14 +135,14 @@ begin
         context := array[]::text[];
         -- done resetting context; handle addition and deletion
         if C[i][j-1] > C[i-1][j] THEN
-            raise notice 'added: %', Yline;
+            --raise notice 'added: %', Yline;
             -- must have been added
             hunk := ('+' || Yline) || hunk;
             hunk_lines_added := hunk_lines_added + 1;
             j := j - 1;
             continue;
         ELSE
-            raise notice 'deleted: %', Xline;
+            --raise notice 'deleted: %', Xline;
             -- must have been deleted
             hunk := ('-' || Xline) || hunk;
             hunk_lines_deleted := hunk_lines_deleted + 1;

diffing.sql renamed to utils.sql

@@ -34,7 +34,6 @@ begin
             END IF;
         end loop;
     end loop;
-    raise notice '%', C;
     RETURN C;
 end;
 $$ language plpgsql