From d0d991c061a29cdf09d61b0c1ed9d678704a228c Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Wed, 22 Apr 2020 17:49:29 +0200
Subject: [PATCH] Fixed metadata storage

---
 .../w2phtml/xhtml/content/TextParser.java     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/w2phtml/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java
index 56c23f1..a7d12a4 100644
--- a/src/main/java/w2phtml/xhtml/content/TextParser.java
+++ b/src/main/java/w2phtml/xhtml/content/TextParser.java
@@ -27,14 +27,11 @@ package w2phtml.xhtml.content;
 
 import static w2phtml.office.XMLString.*;
 
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Stack;
+import java.util.Set;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import pro.litvinovg.xml.Debug;
 import w2phtml.office.FontDeclaration;
 import w2phtml.office.ListCounter;
 import w2phtml.office.ListStyle;
@@ -53,7 +50,6 @@ import w2phtml.xhtml.XhtmlConfig;
 import w2phtml.xhtml.XhtmlStyleMap;
 import w2phtml.xhtml.XhtmlStyleMapItem;
 
-import org.hamcrest.core.IsEqual;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.w3c.dom.Document;
@@ -1508,24 +1504,24 @@ public class TextParser extends Parser {
 	}
   
 	public void addJSONMetadata(String data) {
-		Iterator<String> names = null;
-		JSONObject json = null;
 		try {
-  		json = new JSONObject(data);
-  		names = json.keys();
-  	} catch (JSONException e) {
+  		JSONObject json = new JSONObject(data);
+  		 Set<String> nums = json.keySet();
+  			for (String number : nums) {
+  				JSONObject meta = (JSONObject) json.get(number);
+  				Set<String> names = meta.keySet();
+  				for (String name: names) {
+  					String value = meta.getString(name);
+  					writeMetadata(name, value);
+  				}	
+  			}
+		} catch (JSONException e) {
 			e.printStackTrace();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		if (names == null || json == null) {
-			return;
-		}
-		while (names.hasNext()) {
-			String metaName = names.next();
-			String metaValue = (String) json.get(metaName);
-			writeMetadata(metaName, metaValue);
-		}
+		
+		
 	}
 
 	private void writeMetadata(String name, String value) {