diff options
| author | randomdan <randomdan@localhost> | 2011-02-21 00:26:29 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-02-21 00:26:29 +0000 |
| commit | 6b4a2ee1d5ad724781f6c5c948521a538c7ead17 (patch) | |
| tree | 12b9c83bf5e50027b1c51c48961e8b6081fd2e27 | |
| parent | Don't require the (probably repeated) inclusion of datasource definitions, ha... (diff) | |
| download | gentoobrowse-6b4a2ee1d5ad724781f6c5c948521a538c7ead17.tar.bz2 gentoobrowse-6b4a2ee1d5ad724781f6c5c948521a538c7ead17.tar.xz gentoobrowse-6b4a2ee1d5ad724781f6c5c948521a538c7ead17.zip | |
Fix a few odds and ends
| -rw-r--r-- | gentoobrowse/console/emailebuilds.xml | 4 | ||||
| -rw-r--r-- | gentoobrowse/console/packageimport.xml | 8 | ||||
| -rw-r--r-- | gentoobrowse/datasources/postgres.xml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gentoobrowse/console/emailebuilds.xml b/gentoobrowse/console/emailebuilds.xml index b02d102..af8c83e 100644 --- a/gentoobrowse/console/emailebuilds.xml +++ b/gentoobrowse/console/emailebuilds.xml @@ -15,11 +15,11 @@ </sql> </project2:sqlrows> <project2:iterate name="users" source="usersToEmail"> - <project2:sendmail server="smtp.random.lan:25" subject="Gentoo Browse - New package versions" + <project2:sendmail name="sendemail" server="smtp.random.lan:25" subject="Gentoo Browse - New package versions" present="newpackageversions" from=""Gentoo Browse" <noreply@gentoobrowse.randomdan.homeip.net>"> <to source="parent" name="useremail" depth="1" /> </project2:sendmail> - <project2:sqltask datasource="postgres"> + <project2:sqltask name="recordsent" datasource="postgres"> <sql> insert into user_ebuild_emails(ebuildid, userid, sentat) select ut.ebuildid, ut.userid, now() diff --git a/gentoobrowse/console/packageimport.xml b/gentoobrowse/console/packageimport.xml index 23d4641..cdb66ff 100644 --- a/gentoobrowse/console/packageimport.xml +++ b/gentoobrowse/console/packageimport.xml @@ -103,7 +103,7 @@ </columns> </project2:sqlmerge> - <project2:sqlmerge name="deps" datasource="postgres" targettable="ebuild_deps" useview="yes"> + <project2:sqlmerge name="deps" datasource="postgres" targettable="ebuild_deps" useview="no"> <sql> SELECT fileid AS ebuildid, packageid, COALESCE(slot, '') AS slot, COALESCE(op, '') AS op, COALESCE(versionspec, '') AS versionspec, COALESCE(flags, '') AS flags @@ -112,7 +112,7 @@ field[1] AS op, field[5] AS versionspec, field[9] AS flags FROM ( SELECT fileid, REGEXP_MATCHES(dep, - '([^a-zA-Z0-9]*)([a-zA-Z0-9-]+)/([a-zA-Z0-9_+-]+?)(-([0-9][^:]*))?(:([0-9.]+))?(\\[([^]]+)\\])?') as field + E'([^a-zA-Z0-9]*)([a-zA-Z0-9-]+)/([a-zA-Z0-9_+-]+?)(-([0-9][^:]*))?(:([0-9.]+))?(\\[([^]]+)\\])?') as field FROM ( SELECT fc.fileid, REGEXP_SPLIT_TO_TABLE(fc.content, ' ') AS dep FROM filecache fc, files f @@ -136,7 +136,7 @@ </columns> </project2:sqlmerge> - <project2:sqlmerge name="rdeps" datasource="postgres" targettable="ebuild_rdeps" useview="yes"> + <project2:sqlmerge name="rdeps" datasource="postgres" targettable="ebuild_rdeps" useview="no"> <sql> SELECT fileid AS ebuildid, packageid, COALESCE(slot, '') AS slot, COALESCE(op, '') AS op, COALESCE(versionspec, '') AS versionspec, COALESCE(flags, '') AS flags @@ -145,7 +145,7 @@ field[1] AS op, field[5] AS versionspec, field[9] AS flags FROM ( SELECT fileid, REGEXP_MATCHES(dep, - '([^a-zA-Z0-9]*)([a-zA-Z0-9-]+)/([a-zA-Z0-9_+-]+?)(-([0-9][^:]*))?(:([0-9.]+))?(\\[([^]]+)\\])?') as field + E'([^a-zA-Z0-9]*)([a-zA-Z0-9-]+)/([a-zA-Z0-9_+-]+?)(-([0-9][^:]*))?(:([0-9.]+))?(\\[([^]]+)\\])?') as field FROM ( SELECT fc.fileid, REGEXP_SPLIT_TO_TABLE(fc.content, ' ') AS dep FROM filecache fc, files f diff --git a/gentoobrowse/datasources/postgres.xml b/gentoobrowse/datasources/postgres.xml index 4824855..9bece3e 100644 --- a/gentoobrowse/datasources/postgres.xml +++ b/gentoobrowse/datasources/postgres.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <project2:rdbmsdatasource xmlns:project2="http://project2.randomdan.homeip.net" name="postgres"> <readonly preferlocal="true"> - <dsn host="firebrand"><postgresql>host=localhost user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> + <dsn host="firebrand"><postgresql>host=localhost sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> </readonly> - <masterdsn><postgresql>host=localhost user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn> + <masterdsn><postgresql>host=localhost sslmode=disable user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn> </project2:rdbmsdatasource> |