OpenLP

Merge lp:~trb143/openlp/audit into lp:openlp

  1. audit
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/audit
Merge into: lp:openlp
Diff against target: 548 lines
11 files modified
openlp/core/lib/renderer.py (+0/-2)
openlp/core/lib/songxmlhandler.py (+2/-2)
openlp/core/lib/themexmlhandler.py (+1/-1)
openlp/core/theme/theme.py (+0/-8)
openlp/core/ui/amendthemeform.py (+1/-1)
openlp/plugins/audit/forms/auditdeleteform.py (+17/-200)
openlp/plugins/bibles/lib/bibleHTTPimpl.py (+7/-22)
openlp/plugins/bibles/lib/bibleOSISimpl.py (+5/-6)
openlp/plugins/bibles/lib/common.py (+0/-1)
openlp/plugins/bibles/lib/manager.py (+3/-3)
openlp/plugins/bibles/lib/mediaitem.py (+0/-3)
To merge this branch: bzr merge lp:~trb143/openlp/audit
Reviewer Review Type Date Requested Status
Jon Tibble (community) Approve
Review via email: mp+12467@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Audit will now delete to an input date
Various cleanups like "" and print removals

Revision history for this message
Jon Tibble (meths) wrote :

Looks good, pop a space in on 423.

review: Approve
lp:~trb143/openlp/audit updated
587. By Tim Bentley

Bible Plugin visual change and shorten delay

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/renderer.py'
2--- openlp/core/lib/renderer.py 2009-09-26 12:10:41 +0000
3+++ openlp/core/lib/renderer.py 2009-09-26 19:20:24 +0000
4@@ -396,7 +396,6 @@
5 startx = x
6 starty = y
7 rightextent = None
8- #print "inputs", startx, starty, maxx, maxy
9 # dont allow alignment messing with footers
10 if footer:
11 align = 0
12@@ -404,7 +403,6 @@
13 else:
14 align = int(self._theme .display_horizontalAlign)
15 shadow_offset = self._shadow_offset
16- #print lines
17 for linenum in range(len(lines)):
18 line = lines[linenum]
19 #find out how wide line is
20
21=== modified file 'openlp/core/lib/songxmlhandler.py'
22--- openlp/core/lib/songxmlhandler.py 2009-09-20 18:47:18 +0000
23+++ openlp/core/lib/songxmlhandler.py 2009-09-26 19:20:24 +0000
24@@ -93,7 +93,7 @@
25 """
26 Debugging aid to dump XML so that we can see what we have.
27 """
28- print self.song_xml.toprettyxml(indent=u' ')
29+ return self.song_xml.toprettyxml(indent=u' ')
30
31 def extract_xml(self):
32 """
33@@ -149,4 +149,4 @@
34 """
35 Debugging aid to dump XML so that we can see what we have.
36 """
37- print dump(self.song_xml)
38+ return dump(self.song_xml)
39
40=== modified file 'openlp/core/lib/themexmlhandler.py'
41--- openlp/core/lib/themexmlhandler.py 2009-09-25 00:43:42 +0000
42+++ openlp/core/lib/themexmlhandler.py 2009-09-26 19:20:24 +0000
43@@ -295,7 +295,7 @@
44 Dump the XML to file.
45 """
46 # Debugging aid to see what we have
47- print self.theme_xml.toprettyxml(indent=u' ')
48+ return self.theme_xml.toprettyxml(indent=u' ')
49
50 def extract_xml(self):
51 """
52
53=== modified file 'openlp/core/theme/theme.py'
54--- openlp/core/theme/theme.py 2009-09-25 00:43:42 +0000
55+++ openlp/core/theme/theme.py 2009-09-26 19:20:24 +0000
56@@ -98,7 +98,6 @@
57 # init to defaults
58 self._set_from_XML(blankstylexml)
59 self._set_from_XML(xml)
60-# print self.__str__()
61
62 def _get_as_string(self):
63 s = u''
64@@ -115,23 +114,18 @@
65 for element in iter:
66 if element.tag != u'Theme':
67 t = element.text
68-# print element.tag, t, type(t)
69 val = 0
70 # easy!
71 if type(t) == type(None):
72 val = t
73 # strings need special handling to sort the colours out
74 if type(t) is types.StringType or type(t) is types.UnicodeType:
75-# print u'str',
76 if t[0] == u'$': # might be a hex number
77-# print u'hex',
78 try:
79 val = int(t[1:], 16)
80 except ValueError: # nope
81-# print u'nope'
82 pass
83 elif DelphiColors.has_key(t):
84-# print u'colour ', t
85 val = DelphiColors[t]
86 else:
87 try:
88@@ -142,8 +136,6 @@
89 (element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
90 # convert to a wx.Colour
91 val= QtGui.QColor((val>>16) & 0xFF, (val>>8)&0xFF, val&0xFF)
92-# print [val]
93-# print u'>> ', element.tag, val
94 setattr(self, element.tag, val)
95
96 def __str__(self):
97
98=== modified file 'openlp/core/ui/amendthemeform.py'
99--- openlp/core/ui/amendthemeform.py 2009-09-25 23:06:54 +0000
100+++ openlp/core/ui/amendthemeform.py 2009-09-26 19:20:24 +0000
101@@ -194,7 +194,7 @@
102
103 def onImageToolButtonClicked(self):
104 filename = QtGui.QFileDialog.getOpenFileName(self, 'Open file')
105- if filename != "":
106+ if filename != u'':
107 self.ImageLineEdit.setText(filename)
108 self.theme.background_filename = filename
109 self.previewTheme(self.theme)
110
111=== modified file 'openlp/plugins/audit/forms/auditdeleteform.py'
112--- openlp/plugins/audit/forms/auditdeleteform.py 2009-09-25 20:12:35 +0000
113+++ openlp/plugins/audit/forms/auditdeleteform.py 2009-09-26 19:20:24 +0000
114@@ -22,11 +22,13 @@
115 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
116 ###############################################################################
117
118+from datetime import date
119+
120 from PyQt4 import QtCore, QtGui
121
122 from auditdeletedialog import Ui_AuditDeleteDialog
123 from openlp.core.lib import translate
124-#from openlp.plugins.audit.lib.models import CustomSlide
125+from openlp.plugins.audit.lib import AuditManager
126
127 class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
128 """
129@@ -36,205 +38,20 @@
130 """
131 Constructor
132 """
133+ self.auditmanager = auditmanager
134 QtGui.QDialog.__init__(self, parent)
135- #self.parent = parent
136 self.setupUi(self)
137-# # Connecting signals and slots
138-# QtCore.QObject.connect(self.buttonBox,
139-# QtCore.SIGNAL(u'rejected()'), self.rejected)
140-# QtCore.QObject.connect(self.buttonBox,
141-# QtCore.SIGNAL(u'accepted()'), self.accept)
142-# QtCore.QObject.connect(self.AddButton,
143-# QtCore.SIGNAL(u'pressed()'), self.onAddButtonPressed)
144-# QtCore.QObject.connect(self.EditButton,
145-# QtCore.SIGNAL(u'pressed()'), self.onEditButtonPressed)
146-# QtCore.QObject.connect(self.EditAllButton,
147-# QtCore.SIGNAL(u'pressed()'), self.onEditAllButtonPressed)
148-# QtCore.QObject.connect(self.SaveButton,
149-# QtCore.SIGNAL(u'pressed()'), self.onSaveButtonPressed)
150-# QtCore.QObject.connect(self.DeleteButton,
151-# QtCore.SIGNAL(u'pressed()'), self.onDeleteButtonPressed)
152-# QtCore.QObject.connect(self.ClearButton,
153-# QtCore.SIGNAL(u'pressed()'), self.onClearButtonPressed)
154-# QtCore.QObject.connect(self.UpButton,
155-# QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
156-# QtCore.QObject.connect(self.DownButton,
157-# QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
158-#
159-# QtCore.QObject.connect(self.VerseListView,
160-# QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'),
161-# self.onVerseListViewSelected)
162-# QtCore.QObject.connect(self.VerseListView,
163-# QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
164-# self.onVerseListViewPressed)
165-# QtCore.QObject.connect(Receiver.get_receiver(),
166-# QtCore.SIGNAL(u'update_themes'), self.loadThemes)
167-# # Create other objects and forms
168-# self.custommanager = custommanager
169- self.initialise()
170
171- def initialise(self):
172- pass
173-# self.editAll = False
174-# self.DeleteButton.setEnabled(False)
175-# self.EditButton.setEnabled(False)
176-# self.EditAllButton.setEnabled(True)
177-# self.SaveButton.setEnabled(False)
178-# self.ClearButton.setEnabled(False)
179-# self.TitleEdit.setText(u'')
180-# self.CreditEdit.setText(u'')
181-# self.VerseTextEdit.clear()
182-# self.VerseListView.clear()
183-# #make sure we have a new item
184-# self.customSlide = CustomSlide()
185-# self.ThemeComboBox.addItem(u'')
186-#
187-# def loadThemes(self, themelist):
188-# self.ThemeComboBox.clear()
189-# self.ThemeComboBox.addItem(u'')
190-# for themename in themelist:
191-# self.ThemeComboBox.addItem(themename)
192-#
193-# def loadCustom(self, id):
194-# self.customSlide = CustomSlide()
195-# self.initialise()
196-# if id != 0:
197-# self.customSlide = self.custommanager.get_custom(id)
198-# self.TitleEdit.setText(self.customSlide.title)
199-# self.CreditEdit.setText(self.customSlide.credits)
200-#
201-# songXML = SongXMLParser(self.customSlide.text)
202-# verseList = songXML.get_verses()
203-# for verse in verseList:
204-# self.VerseListView.addItem(verse[1])
205-# theme = unicode(self.customSlide.theme_name)
206-# id = self.ThemeComboBox.findText(theme, QtCore.Qt.MatchExactly)
207-# if id == -1:
208-# id = 0 # Not Found
209-# self.ThemeComboBox.setCurrentIndex(id)
210-# else:
211-# self.ThemeComboBox.setCurrentIndex(0)
212-#
213-# def accept(self):
214-# valid, message = self._validate()
215-# if not valid:
216-# QtGui.QMessageBox.critical(self,
217-# translate(u'customEditDialog', u'Error'), message,
218-# QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
219-# return
220-# sxml = SongXMLBuilder()
221-# sxml.new_document()
222-# sxml.add_lyrics_to_song()
223-# count = 1
224-# for i in range (0, self.VerseListView.count()):
225-# sxml.add_verse_to_lyrics(
226-# u'custom', unicode(count),
227-# unicode(self.VerseListView.item(i).text()))
228-# count += 1
229-# self.customSlide.title = unicode(self.TitleEdit.displayText())
230-# self.customSlide.text = unicode(sxml.extract_xml())
231-# self.customSlide.credits = unicode(self.CreditEdit.displayText())
232-# self.customSlide.theme_name = unicode(self.ThemeComboBox.currentText())
233-# self.custommanager.save_slide(self.customSlide)
234-# self.close()
235-#
236-# def rejected(self):
237-# self.close()
238-#
239-# def onUpButtonPressed(self):
240-# selectedRow = self.VerseListView.currentRow()
241-# if selectedRow != 0:
242-# qw = self.VerseListView.takeItem(selectedRow)
243-# self.VerseListView.insertItem(selectedRow - 1, qw)
244-# self.VerseListView.setCurrentRow(selectedRow - 1)
245-#
246-# def onDownButtonPressed(self):
247-# selectedRow = self.VerseListView.currentRow()
248-# # zero base arrays
249-# if selectedRow != self.VerseListView.count() - 1:
250-# qw = self.VerseListView.takeItem(selectedRow)
251-# self.VerseListView.insertItem(selectedRow + 1, qw)
252-# self.VerseListView.setCurrentRow(selectedRow + 1)
253-#
254-# def onClearButtonPressed(self):
255-# self.VerseTextEdit.clear()
256-# self.editAll = False
257-# self.AddButton.setEnabled(True)
258-# self.EditAllButton.setEnabled(True)
259-# self.SaveButton.setEnabled(False)
260-#
261-# def onVerseListViewPressed(self, item):
262-# self.DeleteButton.setEnabled(True)
263-# self.EditButton.setEnabled(True)
264-#
265-# def onVerseListViewSelected(self, item):
266-# self.editText(item.text())
267-#
268-# def onAddButtonPressed(self):
269-# self.VerseListView.addItem(self.VerseTextEdit.toPlainText())
270-# self.DeleteButton.setEnabled(False)
271-# self.VerseTextEdit.clear()
272-#
273-# def onEditButtonPressed(self):
274-# self.editText(self.VerseListView.currentItem().text())
275-#
276-# def onEditAllButtonPressed(self):
277-# self.editAll = True
278-# self.AddButton.setEnabled(False)
279-# if self.VerseListView.count() > 0:
280-# verse_list = u''
281-# for row in range(0, self.VerseListView.count()):
282-# item = self.VerseListView.item(row)
283-# verse_list += item.text()
284-# verse_list += u'\n---\n'
285-# self.editText(verse_list)
286-#
287-# def editText(self, text):
288-# self.beforeText = text
289-# self.VerseTextEdit.setPlainText(text)
290-# self.DeleteButton.setEnabled(False)
291-# self.EditButton.setEnabled(False)
292-# self.EditAllButton.setEnabled(False)
293-# self.SaveButton.setEnabled(True)
294-# self.ClearButton.setEnabled(True)
295-#
296-# def onSaveButtonPressed(self):
297-# if self.editAll:
298-# self.VerseListView.clear()
299-# for row in unicode(self.VerseTextEdit.toPlainText()).split(u'\n---\n'):
300-# self.VerseListView.addItem(row)
301-# else:
302-# self.VerseListView.currentItem().setText(
303-# self.VerseTextEdit.toPlainText())
304-# #number of lines has change
305-# if len(self.beforeText.split(u'\n')) != \
306-# len(self.VerseTextEdit.toPlainText().split(u'\n')):
307-# tempList = {}
308-# for row in range(0, self.VerseListView.count()):
309-# tempList[row] = self.VerseListView.item(row).text()
310-# self.VerseListView.clear()
311-# for row in range (0, len(tempList)):
312-# self.VerseListView.addItem(tempList[row])
313-# self.VerseListView.repaint()
314-# self.AddButton.setEnabled(True)
315-# self.SaveButton.setEnabled(False)
316-# self.EditButton.setEnabled(False)
317-# self.EditAllButton.setEnabled(True)
318-# self.VerseTextEdit.clear()
319-#
320-# def onDeleteButtonPressed(self):
321-# self.VerseListView.takeItem(self.VerseListView.currentRow())
322-# self.EditButton.setEnabled(False)
323-# self.EditAllButton.setEnabled(True)
324-#
325-# def _validate(self):
326-# if len(self.TitleEdit.displayText()) == 0:
327-# self.TitleEdit.setFocus()
328-# return False, translate(
329-# u'customEditDialog', u'You need to enter a title \n')
330-# # must have 1 slide
331-# if self.VerseListView.count() == 0:
332-# self.VerseTextEdit.setFocus()
333-# return False, translate(
334-# u'customEditDialog', u'You need to enter a slide \n')
335-# return True, u''
336+ def accept(self):
337+ ret = QtGui.QMessageBox.question(None,
338+ translate(u'mainWindow', u'Delete Selected Audit Events?'),
339+ translate(u'mainWindow', u'Are you sure you want to delete selected Audit Data?'),
340+ QtGui.QMessageBox.StandardButtons(
341+ QtGui.QMessageBox.Ok |
342+ QtGui.QMessageBox.Cancel),
343+ QtGui.QMessageBox.Cancel)
344+ if ret == QtGui.QMessageBox.Ok:
345+ qDeleteDate = self.DeleteCalendar.selectedDate()
346+ deleteDate = date(qDeleteDate.year(), qDeleteDate.month(), qDeleteDate.day())
347+ self.auditmanager.delete_to_date(deleteDate)
348+ self.close()
349
350=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
351--- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-25 23:06:54 +0000
352+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-26 19:20:24 +0000
353@@ -57,28 +57,23 @@
354 unicode(bookid) + u'&chapter' + unicode(chapter) + u'&version=' + \
355 unicode(version)
356 xml_string = self._get_web_text(urlstring, self.proxyurl)
357- #print xml_string
358 VerseSearch = u'class=' + u'"' + u'sup' + u'"' + u'>'
359 verse = 1
360 i = xml_string.find(u'result-text-style-normal')
361 xml_string = xml_string[i:len(xml_string)]
362 versePos = xml_string.find(VerseSearch)
363- #print versePos
364 bible = {}
365 while versePos > -1:
366- verseText = '' # clear out string
367+ # clear out string
368+ verseText = ''
369 versePos = xml_string.find(u'</span', versePos)
370 i = xml_string.find(VerseSearch, versePos+1)
371- #print i, versePos
372 if i == -1:
373 i = xml_string.find(u'</div', versePos+1)
374 j = xml_string.find(u'<strong', versePos+1)
375- #print i, j
376 if j > 0 and j < i:
377 i = j
378 verseText = xml_string[versePos + 7 : i ]
379- #print xml_string
380- #print 'VerseText = ' + unicode(verse) +' '+ verseText
381 bible[verse] = self._clean_text(verseText) # store the verse
382 versePos = -1
383 else:
384@@ -121,9 +116,9 @@
385 log.debug(u'get_bible_chapter %s,%s,%s,%s',
386 version, bookid, bookname, chapter)
387 bookname = bookname.replace(u' ', u'')
388- urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s' % (bookname, chapter, version)
389+ urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s'\
390+ % (bookname, chapter, version)
391 xml_string = self._get_web_text(urlstring, self.proxyurl)
392- #log.debug(u'Return data %s', xml_string)
393 ## Strip Book Title from Heading to return it to system
394 ##
395 i= xml_string.find(u'<title>')
396@@ -136,11 +131,8 @@
397 book_title = book_title[:i].rstrip()
398 log.debug(u'Book Title %s', book_title)
399 log.debug(u'Book Chapter %s', book_chapter)
400+ # Strip Verse Data from Page and build an array
401
402- ## Strip Verse Data from Page and build an array
403- ##
404- #log.debug(u'bible data %s', xml_string)
405- #print xml_string
406 i= xml_string.find(u'NavCurrentChapter')
407 xml_string = xml_string[i:len(xml_string)]
408 i= xml_string.find(u'<TABLE')
409@@ -153,15 +145,13 @@
410 #remove the <B> at the front
411 xml_string = xml_string[i + 3 :len(xml_string)]
412 versePos = xml_string.find(u'<BLOCKQUOTE>')
413- #log.debug(u'verse pos %d', versePos)
414 bible = {}
415 while versePos > 0:
416 verseText = u''
417 versePos = xml_string.find(u'<B><I>', versePos) + 6
418 i = xml_string.find(u'</I></B>', versePos)
419- #log.debug( versePos, i)
420- verse= xml_string[versePos:i] # Got the Chapter
421- #log.debug( 'Chapter = %s', verse)
422+ # Got the Chapter
423+ verse= xml_string[versePos:i]
424 # move the starting position to begining of the text
425 versePos = i + 8
426 # find the start of the next verse
427@@ -171,14 +161,9 @@
428 verseText = xml_string[versePos: i]
429 versePos = 0
430 else:
431- #log.debug( i, versePos)
432 verseText = xml_string[versePos: i]
433 versePos = i
434- #print verseText
435- #print self._clean_text(verseText)
436 bible[verse] = self._clean_text(verseText)
437-
438- #log.debug( bible)
439 return SearchResults(book_title, book_chapter, bible)
440
441 class BibleHTTPImpl():
442
443=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
444--- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-25 23:06:54 +0000
445+++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-26 19:20:24 +0000
446@@ -30,7 +30,7 @@
447
448 from PyQt4 import QtCore
449
450-from openlp.core.lib import Receiver
451+from openlp.core.lib import translate, Receiver
452
453 class BibleOSISImpl():
454 """
455@@ -51,6 +51,7 @@
456 ``bibledb``
457 A reference to a Bible database object.
458 """
459+ log.info(u'BibleOSISImpl Initialising')
460 self.bibledb = bibledb
461 # books of the bible linked to bibleid {osis , name}
462 self.booksOfBible = {}
463@@ -90,7 +91,6 @@
464 detect_file.close()
465 osis = codecs.open(osisfile_record, u'r', details['encoding'])
466 book_ptr = None
467- #id = 0
468 count = 0
469 verseText = u'<verse osisID='
470 testament = 1
471@@ -123,7 +123,6 @@
472 while pos > -1:
473 epos = text.find(u'<Fi>', pos)
474 if epos == -1: # TODO
475- #print "Y", search_text, e
476 pos = -1
477 else:
478 text = text[:pos] + text[epos + 4: ]
479@@ -132,7 +131,6 @@
480 while pos > -1:
481 epos = text.find(u'<Rf>', pos)
482 text = text[:pos] + text[epos + 4: ]
483- #print "X", pos, epos, text
484 pos = text.find(u'<RF>')
485 # split up the reference
486 p = ref.split(u'.', 3)
487@@ -149,8 +147,9 @@
488 testament += 1
489 book_ptr = p[0]
490 book = self.bibledb.create_book(
491- self.booksOfBible[p[0]],
492- self.abbrevOfBible[p[0]], testament)
493+ unicode(translate(u'BibleBooks', self.booksOfBible[p[0]])),
494+ unicode(translate(u'BibleBooks', self.abbrevOfBible[p[0]])),
495+ testament)
496 dialogobject.incrementProgressBar(
497 self.booksOfBible[p[0]])
498 Receiver().send_message(u'process_events')
499
500=== modified file 'openlp/plugins/bibles/lib/common.py'
501--- openlp/plugins/bibles/lib/common.py 2009-09-25 00:43:42 +0000
502+++ openlp/plugins/bibles/lib/common.py 2009-09-26 19:20:24 +0000
503@@ -153,7 +153,6 @@
504 text = text.replace(u'</P>', u'')
505 text = text.replace(u'<BR>', u'')
506 text = text.replace(u'<BR />', u'')
507- #text = text.replace(chr(189), u'1/2');print "l"
508 text = text.replace(u'&quot;', u'\"')
509 text = text.replace(u'&apos;', u'\'')
510 # Remove some other tags
511
512=== modified file 'openlp/plugins/bibles/lib/manager.py'
513--- openlp/plugins/bibles/lib/manager.py 2009-09-25 23:06:54 +0000
514+++ openlp/plugins/bibles/lib/manager.py 2009-09-26 19:20:24 +0000
515@@ -177,14 +177,14 @@
516 nbible.save_meta(u'WEB', biblesource)
517 # store the web id of the bible
518 nbible.save_meta(u'bibleid', bibleid)
519- if proxyurl is not None and proxyurl != "":
520+ if proxyurl is not None and proxyurl != u'':
521 # store the proxy URL
522 nbible.save_meta(u'proxy', proxyurl)
523 nhttp.set_proxy(proxyurl)
524- if proxyid is not None and proxyid != "":
525+ if proxyid is not None and proxyid != u'':
526 # store the proxy userid
527 nbible.save_meta(u'proxyid', proxyid)
528- if proxypass is not None and proxypass != "":
529+ if proxypass is not None and proxypass != u'':
530 # store the proxy password
531 nbible.save_meta(u'proxypass', proxypass)
532 return True
533
534=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
535--- openlp/plugins/bibles/lib/mediaitem.py 2009-09-26 12:10:41 +0000
536+++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-26 19:20:24 +0000
537@@ -474,11 +474,8 @@
538 start_chapter = chapter
539 else:
540 # more complex
541- #print search
542 sp = search.split(u'-') #find first
543- #print sp, len(sp)
544 sp1 = sp[0].split(u':')
545- #print sp1, len(sp1)
546 if len(sp1) == 1:
547 start_chapter = sp1[0]
548 start_verse = 1