rikkinäisten otsikkojen korjaamisen korjaaminen lol

Author: ArttKan

backend/src/app.ts

@@ -336,10 +336,19 @@ app.post('/api/statute/normalize-titles/:year', verifyAdminToken, async (req: ex
       return;
     }
 
+    console.log(`[normalize-titles] Starting normalization for year ${yearNum}`);
     const updatedCount = await normalizeStatuteTitlesByYear(yearNum);
+    console.log(`[normalize-titles] Normalized ${updatedCount} statutes, now syncing to Typesense...`);
+    
     await syncStatutes('fin', { startYear: yearNum, endYear: yearNum });
     await syncStatutes('swe', { startYear: yearNum, endYear: yearNum });
-    res.status(200).json({ message: 'Statute titles normalized', year: yearNum, updatedCount });
+    
+    console.log(`[normalize-titles] Successfully completed normalization and sync for year ${yearNum}`);
+    res.status(200).json({ 
+      message: 'Statute titles normalized and synced', 
+      year: yearNum, 
+      updatedCount 
+    });
   } catch (error) {
     console.error('Normalize statute titles endpoint error:', error);
     Sentry.captureException(error);

backend/src/db/db.ts

@@ -435,7 +435,7 @@ async function normalizeStatuteTitlesByYear(year: number): Promise<number> {
   try {
     const client = await pool.connect();
     const result = await client.query(
-      'SELECT uuid, content::text AS content FROM statutes WHERE year = $1',
+      'SELECT uuid, content::text AS content, number, language FROM statutes WHERE year = $1',
       [year]
     );
     let updatedCount = 0;
@@ -445,13 +445,15 @@ async function normalizeStatuteTitlesByYear(year: number): Promise<number> {
         const title = await parseTitleFromXmlString(row.content);
         await client.query('UPDATE statutes SET title = $1 WHERE uuid = $2', [title, row.uuid]);
         updatedCount += 1;
+        console.log(`[normalize] Updated title for statute ${row.number}/${year} (${row.language}): "${title}"`);
       } catch (error) {
-        console.error('Failed to normalize title for statute', row.uuid, error);
+        console.error(`Failed to normalize title for statute ${row.uuid} (${row.number}/${year}, ${row.language}):`, error);
         Sentry.captureException(error);
       }
     }
 
     client.release();
+    console.log(`[normalize] Successfully updated ${updatedCount} out of ${result.rows.length} statutes for year ${year}`);
     return updatedCount;
   } catch (error) {
     console.error('Error normalizing statute titles by year:', error);

backend/src/db/load.ts

@@ -36,7 +36,7 @@ finlexLimiter.on('executing', () => {
 
 export function startFinlexLimiterLogging() {
   if (finlexLogInterval) {
-    return;
+    return; // Already started
   }
 
   console.log('[finlexLimiter] Starting rate limiter logging...');
@@ -166,19 +166,40 @@ function buildJudgmentUrl(judgment: JudgmentKey): string {
   return `${baseUrl}/${casestatute}/${prefix}/${path}`;
 }
 
-
-
+function parseTitleFromXMLDOM(xmlString: string): string {
+  const dom = new JSDOM(xmlString, { contentType: 'text/xml' });
+  const doc = dom.window.document;
+  
+  // Find the docTitle element
+  const docTitleElement = doc.querySelector('docTitle');
+  
+  if (!docTitleElement) {
+    throw new Error('docTitle not found in XML');
+  }
+  
+  // Get the text content which preserves document order
+  const title = docTitleElement.textContent || '';
+  
+  // Clean up extra whitespace and newlines
+  return title.replace(/\s+/g, ' ').trim();
+}
 
 async function parseTitlefromXML(result: AxiosResponse<unknown>): Promise<string> {
-  const xmlData = result.data as Promise<string>;
-  const parsedXmlData = await parseStringPromise(xmlData, { explicitArray: false })
-
-  const resultNode = parsedXmlData?.akomaNtoso
-  if (!resultNode) {
-    throw new Error('Result node not found in XML')
+  const xmlString = result.data as string;
+  
+  try {
+    // Use DOM parser to preserve document order
+    return parseTitleFromXMLDOM(xmlString);
+  } catch (domError) {
+    // Fallback to xml2js parser
+    console.warn('DOM parsing failed, falling back to xml2js:', domError);
+    const parsedXmlData = await parseStringPromise(xmlString, { explicitArray: false })
+    const resultNode = parsedXmlData?.akomaNtoso
+    if (!resultNode) {
+      throw new Error('Result node not found in XML')
+    }
+    return parseTitleFromXmlObject(resultNode)
   }
-
-  return parseTitleFromXmlObject(resultNode)
 }
 
 export function parseTitleFromXmlObject(resultNode: any): string {
@@ -188,23 +209,56 @@ export function parseTitleFromXmlObject(resultNode: any): string {
     throw new Error('docTitle not found')
   }
 
-  if (typeof docTitleRaw === 'string') {
-    return docTitleRaw.trim()
-  }
-  if (typeof docTitleRaw === 'object' && typeof docTitleRaw._ === 'string') {
-    return docTitleRaw._.trim()
+  // Helper function to recursively extract text from nested objects
+  function extractText(obj: any): string {
+    if (typeof obj === 'string') {
+      return obj;
+    }
+    
+    if (typeof obj === 'object' && obj !== null) {
+      let text = '';
+      
+      // Handle the _ property (text content)
+      if (obj._ && typeof obj._ === 'string') {
+        text += obj._;
+      }
+      
+      // Handle ref objects (references with text and links)
+      if (obj.ref) {
+        text += extractText(obj.ref);
+      }
+      
+      // Handle arrays of mixed content
+      if (Array.isArray(obj)) {
+        text += obj.map(item => extractText(item)).join('');
+      }
+      
+      return text;
+    }
+    
+    return String(obj);
   }
 
-  return String(docTitleRaw).trim()
+  const title = extractText(docTitleRaw);
+  
+  // Clean up extra whitespace and newlines
+  return title.replace(/\s+/g, ' ').trim();
 }
 
 export async function parseTitleFromXmlString(xml: string): Promise<string> {
-  const parsedXmlData = await parseStringPromise(xml, { explicitArray: false })
-  const resultNode = parsedXmlData?.akomaNtoso
-  if (!resultNode) {
-    throw new Error('Result node not found in XML')
+  try {
+    // Use DOM parser to preserve document order
+    return parseTitleFromXMLDOM(xml);
+  } catch (domError) {
+    // Fallback to xml2js parser
+    console.warn('DOM parsing failed, falling back to xml2js:', domError);
+    const parsedXmlData = await parseStringPromise(xml, { explicitArray: false })
+    const resultNode = parsedXmlData?.akomaNtoso
+    if (!resultNode) {
+      throw new Error('Result node not found in XML')
+    }
+    return parseTitleFromXmlObject(resultNode)
   }
-  return parseTitleFromXmlObject(resultNode)
 }
 
 async function parseImagesfromXML(result: AxiosResponse<unknown>): Promise<string[]> {