diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-03-04 06:59:56 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-03-04 06:59:56 +0100 |
| commit | c2f88f9a76cbc83110fbe8c83475c5c2193b1d6b (patch) | |
| tree | 5ded563b57a6687fc7abc7760d4dcf1b71915d39 | |
| parent | 7532175aa361b5c8e6c9f28e82acfa705f325aee (diff) | |
handle differences between report-bulk-objects and sco-contents
| -rw-r--r-- | meetingtools/apps/room/tasks.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meetingtools/apps/room/tasks.py b/meetingtools/apps/room/tasks.py index 92d1cc7..55f8cb9 100644 --- a/meetingtools/apps/room/tasks.py +++ b/meetingtools/apps/room/tasks.py @@ -102,16 +102,16 @@ def _import_one_room(acc,api,row): logging.warning("username not found for sco-id=%s while importing" % sco_id) return - def _ft(t,*exprs): + def _ft(t,exprs): for e in exprs: - v = t.findtext(exprs) + v = t.findtext(e) if v is not None: return v return None logging.debug(etree.tostring(row)) logging.debug(etree.tostring(r)) - urlpath = _ft(row, "url[0]", "url-path[0]").strip("/") + urlpath = _ft(row, ["url[0]", "url-path[0]"]).strip("/") name = row.findtext('name[0]') description = row.findtext('description[0]') |