*** upcfind.py	Tue Apr 10 18:25:34 2001
--- upcfind.py.new	Tue Apr 10 18:27:33 2001
***************
*** 60,67 ****
  except:
      pass
  
! upcnull = "------------ -----"
! isbnnull = "============= ====="
  
  lastupc = upcnull
  lastisbn = isbnnull
--- 60,67 ----
  except:
      pass
  
! upcnull = "-----------------"
! isbnnull = "=================="
  
  lastupc = upcnull
  lastisbn = isbnnull
***************
*** 78,100 ****
          isbnval = line[eqpos+1:]
          add_mapping(upcval, isbnval)
          continue
!     if (len(line) == 18 and line[12] == " "):
          lastupc = line
!     if (len(line) == 19 and line[13] == " "):
          lastisbn = line[:13]
      if (len(line) == 13):
          lastisbn = line
!     if (lastupc[13:18] == lastisbn[7:12]):
          #print "###4:", lastupc[0:6], lastisbn[3:7]
          add_mapping(lastupc[0:6], lastisbn[3:7])
          lastupc = upcnull
          lastisbn = isbnnull
!     if (lastupc[14:18] == lastisbn[8:12]):
          #print "###5:", lastupc[0:6], lastisbn[3:8]
          add_mapping(lastupc[0:6], lastisbn[3:8])
          lastupc = upcnull
          lastisbn = isbnnull
!     if (lastupc[15:18] == lastisbn[9:12]):
          #print "###6:", lastupc[0:6], lastisbn[3:9]
          add_mapping(lastupc[0:6], lastisbn[3:9])
          lastupc = upcnull
--- 78,100 ----
          isbnval = line[eqpos+1:]
          add_mapping(upcval, isbnval)
          continue
!     if (len(line) == 17):
          lastupc = line
!     if (len(line) == 18):
          lastisbn = line[:13]
      if (len(line) == 13):
          lastisbn = line
!     if (lastupc[12:17] == lastisbn[7:12]):
          #print "###4:", lastupc[0:6], lastisbn[3:7]
          add_mapping(lastupc[0:6], lastisbn[3:7])
          lastupc = upcnull
          lastisbn = isbnnull
!     if (lastupc[13:17] == lastisbn[8:12]):
          #print "###5:", lastupc[0:6], lastisbn[3:8]
          add_mapping(lastupc[0:6], lastisbn[3:8])
          lastupc = upcnull
          lastisbn = isbnnull
!     if (lastupc[14:17] == lastisbn[9:12]):
          #print "###6:", lastupc[0:6], lastisbn[3:9]
          add_mapping(lastupc[0:6], lastisbn[3:9])
          lastupc = upcnull