← Back to branch summary

~ubuntu-branches/ubuntu/natty/ubufox/natty-updates

« back to all changes in this revision

Viewing changes to pfs/web/plugin-finder.py

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-06-27 20:29:51 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20120627202951-lga8bs5atph93l0f
Tags: 2.1.1-0ubuntu0.11.04.1
* New upstream release v2.1.1
  - Drop the alternative plugin selector, as it depends on a patch that
    we no longer carry in Firefox

Show diffs side-by-side

added added

removed removed

Lines of Context:
pfs/web/plugin-finder.py
36
36
counter=0
37
37
docroot=""
38
38
CACHE_TIME_SEC=3600
39
 
DB_DIR="/home/asac/pfsdb/"
 
39
DB_DIR="/home/chr1s/public_html/pfsdb/"
40
40
ENABLE_MOZILLA_PFS_RESULTS=None
41
41
 
42
42
arch_map=dict()
123
123
        appid = parameters['appID']
124
124
 
125
125
        cur = apt_con.cursor()
126
 
        cur.execute("SELECT name, mimetype, pkgname, description, section, filehint FROM package " \
 
126
        cur.execute("SELECT name, mimetype, pkgname, description, section, filehint, manualInstallURL FROM package " \
127
127
                        + "WHERE mimetype=? AND architecture=? AND appid=? " \
128
128
                        + "AND distribution=? order by package.weight desc", (mimetype, architecture, appid, distribution))
129
129
        for row in cur:
130
 
                apturl = "apt:" + row[2] + "?section=" + row[4]
131
 
                if row[4] == "multiverse":
132
 
                        apturl = apturl + "?section=universe"
 
130
                apturl = ""
 
131
                if row[2] != "":
 
132
                        section = row[4]
 
133
                        apturl = "apt:" + row[2] + "?section=" + section
 
134
 
133
135
                desc = plugindata.PluginDescription (           \
134
136
                                row[0],         \
135
137
                                row[1],         \
138
140
                                None,           \
139
141
                                apturl, \
140
142
                                None,   \
141
 
                                None,   \
 
143
                                row[6], \
142
144
                                None,           \
143
145
                                "false", \
144
146
                                row [5], \