- misc fixes (still pre-alpha-release :) )

Changed files:
    pldnotify.awk -> 1.2

diff --git a/pldnotify.awk b/pldnotify.awk
index 0099cd856a8df59cdc07143bd657304952c5aefe..b13cd8782ddadfd00569b8498b35fce72ca0343c 100644 (file)
--- a/pldnotify.awk
+++ b/pldnotify.awk
@@ -1,6 +1,7 @@
 #!/bin/awk -f
 
 function subst_defines(var,defs) {
+# substitute all possible RPM macros
        while ((var ~ /%{.*}/) || (var ~ /%[A-Za-z0-9_]+/)) {
                oldvar=var
                for (j in defs) {
@@ -16,6 +17,8 @@ function subst_defines(var,defs) {
 }
 
 function process_source(lurl,version) {
+# fetches file list, and compares version numbers
+       if ( DEBUG ) print "Przetwarzam " lurl
        sub("://",":",lurl)
        sub("/",":/",lurl)
        gsub("[^/]*$",":&",lurl)
@@ -23,25 +26,26 @@ function process_source(lurl,version) {
        acc=url[1]
        host=url[2]
        dir=url[3]
-       if ( DEBUG ) print acc "://" host dir 
+       if ( DEBUG ) print "LYNX " acc "://" host dir 
        
        references=0
-       while ( "lynx --dump " acc "://" host dir | getline result ) {
-               if ( result ~ "References" ) references=1
-               if ( result ~ "[0-9]+\. (ftp|http)://" ) {
+       while (("lynx --dump " acc "://" host dir) | getline result ) {
+               if (result ~ "References") references=1
+               if ((result ~ "[0-9]+\. (ftp|http)://")&&(references==1)) {
                        split(result,links)
                        addr=links[2]
-                       # if (DEBUG)
-                       print addr
+                       if (DEBUG) print "Znaleziony link: " addr
                }
        }
 }
        
-function process_data(name,ver,rel,defs,src) {
+function process_data(name,ver,rel,src) {
+# this function checks if substitutions were valid, and if true:
+# processes each URL and tries to get current file list
        for (i in src) {
                if ( src[i] !~ /%{.*}/ && src[i] !~ /%[A-Za-z0-9_]/ )  {
                        if ( DEBUG ) print "Zrodlo: " src[i]
-                       # process_source(src[i],defs["version"])
+                       process_source(src[i],defs["version"])
                } else {
                        print FNAME ":" i ": niemozliwe podstawienie: " src[i]
                }
@@ -51,12 +55,12 @@ function process_data(name,ver,rel,defs,src) {
 BEGIN {
        # if U want to use DEBUG, run script with "-v DEBUG=1"
        # or uncomment the line below
-       # DEBUG = 1
+       DEBUG = 1
 }
 
 FNR==1 {
        if ( ARGIND != 1 ) {
-               process_data(NAME,VER,REL,DEFS,SRC)
+               process_data(NAME,VER,REL,SRC)
                NAME="" ; VER="" ; REL=""
                for (i in DEFS) delete DEFS[i]
                for (i in SRC) delete SRC[i]
@@ -64,6 +68,7 @@ FNR==1 {
        FNAME=FILENAME
 }
 
+/^[Uu][Rr][Ll]:/&&(URL=="") { URL=subst_defines($2,DEFS) ; DEFS["url"]=URL }
 /^[Nn]ame:/&&(NAME=="") { NAME=subst_defines($2,DEFS) ; DEFS["name"]=NAME }
 /^[Vv]ersion:/&&(VER=="") { VER=subst_defines($2,DEFS) ; DEFS["version"]=VER }
 /^[Rr]elease:/&&(REL=="") { REL=subst_defines($2,DEFS) ; DEFS["release"]=REL }
@@ -71,5 +76,5 @@ FNR==1 {
 /%define/ { DEFS[$2]=subst_defines($3,DEFS) }
 
 END {
-       process_data(NAME,VER,REL,DEFS,SRC)
+       process_data(NAME,VER,REL,SRC)
 }