--- find3.pl	2002/01/31 16:54:32	1.1
+++ find3.pl	2002/02/05 12:58:30	1.2
@@ -127,16 +127,11 @@
 		s/\015//g;	# kill cr
 		tr/šðžèæŠÐŽÈÆ/¹ð¾èæ©Ð®ÈÆ/;	# 1250 -> iso8859-2
 
-		$sadrzaj++ if (m,<div class=sadrzaj>,);
-	
-		if ($sadrzaj) {
-			if (s/<a href="#([^"]+)">\s*(\d+)\.\s*<[^>]+>//i) {
-				($aname,$nr) = ($1,$2);
-				$aname = $1 if ($aname =~ m/Javascript:Mojdok\(\d+,\d+,\d+,(\d+)\);/);
-			}
-			$naslov.=$_;
+		if (m,<div class=sadrzaj>,) {
+			$sadrzaj++;
+			next;
 		}
-		
+
 		if ($sadrzaj && m,</div>,) {
 			$sadrzaj--;
 			$naslov=~s/\s+/ /g;
@@ -152,6 +147,20 @@
 			$naslov="";
 			$nr=0;
 		}
+
+		if ($sadrzaj) {
+			if (s/<a href="#([^"]+)">\s*(\d+)\.\s*<[^>]+>//i) {
+				($aname,$nr) = ($1,$2);
+			} elsif (s/<a href="Javascript:Mojdok\((\d+),(\d+),(\d+),(\d+)\)[^>]*>//i) {
+				($nr,$aname) = ($3,$4);
+				die "conflict in godina: $1 != $god"  if ($god != $1);
+				die "conflict in broj: $2 != $br"  if ($br != $2);
+			} else {
+				die "can't find nr in line: $_";
+			}
+			$naslov.=$_;
+		}
+		
 	}
 
 	close(IN);