daoadresseservice/db/DatabaseLayer.java

package dk.daoas.daoadresseservice.db;


import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import dk.daoas.daoadresseservice.DaekningsType;
import dk.daoas.daoadresseservice.beans.Address;
import dk.daoas.daoadresseservice.beans.AliasBean;
import dk.daoas.daoadresseservice.beans.ExtendedBean;
import dk.daoas.daoadresseservice.beans.HundredePctBean;
import dk.daoas.daoadresseservice.beans.LoggedAddress;
import dk.daoas.daoadresseservice.beans.SearchResult;
import dk.daoas.daoadresseservice.util.DeduplicateHelper;

public class DatabaseLayer {
        
        static boolean DEBUG = false;
        
        public static List<Address> getAllAdresses() throws SQLException {
                String debugFilter = DatabaseLayer.DEBUG ? " AND postnr = 8700 " : "";
                
                String sql = 
                                "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,latitude,longitude "
                                + "FROM fulddaekning.adressetabel "
                                + "WHERE gadeid IS NOT NULL "
                                + debugFilter
                                ;
                
                try ( Connection conn = DBConnection.getConnection();           
                                Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                                ) {
                        stmt.setFetchSize(Integer.MIN_VALUE);
                        ResultSet res = stmt.executeQuery(sql);
                        
                        List<Address> list = new ArrayList<Address>(2600000);//initial capacity 2.6 mio
                        
                        DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>();
                        DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
                        DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
                        DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>();
                        DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
        
                        
                        while (res.next()) {
                                
                                Address a = new Address();
                                a.id = res.getInt(1);
                                a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
                                a.husnr = (short) res.getInt(3);
                                a.husnrbogstav = husnrbogstavCache.getInstance( res.getString(4) );
                                a.kommunekode = (short) res.getInt(5);
                                a.vejkode = (short)res.getInt(6);
                                a.postnr = (short)res.getInt(7);
                                a.gadeid = res.getInt(8);
                                a.distributor = distributorCache.getInstance(res.getString(9));
                                a.dbkBane = (short) res.getInt(10);
                                a.koreliste = korelisteCache.getInstance( res.getString(11) );
                                a.rute = ruteCache.getInstance( res.getString(12) );
                                a.latitude = (float) res.getDouble(13);
                                a.longitude = (float) res.getDouble(14);
                                
                                //a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
                                
                                if (a.rute != null && a.rute.length()> 0) {
                                        a.daekningsType = DaekningsType.DAEKNING_DIREKTE;
                                } else {
                                        a.daekningsType = DaekningsType.DAEKNING_IKKEDAEKKET;
                                }                       
                                
                                list.add(a);
                        }
                        res.close();
                        stmt.close();
                        conn.close();
                        
                        System.out.println("Loaded " + list.size() + " adresses");
                        
                        return list;
                }
        }
        
        public static List<AliasBean> getAliasList() throws SQLException {
                

                String sql = "SELECT postnr,vejnavn,aliasvejnavn " +
                                        "FROM bogleveringer.vejtabelprod " 
                                        ;
                
                try ( Connection conn = DBConnection.getConnection();           
                                Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                                ) {
                                        
                        stmt.setFetchSize(Integer.MIN_VALUE);
                        
                        ResultSet res = stmt.executeQuery(sql);
                        
                        DeduplicateHelper<String> vejCache = new DeduplicateHelper<String>();
                        
                        List<AliasBean> list = new ArrayList<AliasBean>( 5000); 
                        while (res.next()) {            
                                
                                AliasBean ab = new AliasBean();
                                ab.postnr = res.getShort(1);
                                ab.vejnavn = vejCache.getInstance( res.getString(2) );
                                ab.aliasVejnavn = vejCache.getInstance( res.getString(3) );
                                                        
                                list.add(ab);
                        }
                
                        res.close();
                        
                        System.out.println("Loaded " + list.size() + " aliase beans");
                        
                        return list;
                }

        }
        
        public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
                String debugFilter1 = DatabaseLayer.DEBUG ? " WHERE orgPostnr = 8700 " : "";
                String debugFilter2 = DatabaseLayer.DEBUG ? " AND orgPostnr = 8700 " : "";
                
                
                String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " +
                                        "join odbc.transporttype t " + 
                                        "on t.Art = 'Transpost' " +
                                        "and ( (t.Type = 'Cykel' and a.Afstand < 1.001) or (t.Type = 'Scooter' and a.Afstand < 1.201) or (t.Type = 'Bil' and a.Afstand < 2.601) ) " +
                                        "and t.Rute = a.Rute " + 
                                        debugFilter1 +
                                        
                                        "UNION ALL " +
                                        
                                        "SELECT orgid, a.id as targetid, afstand,'' as type FROM  fulddaekning.afstand_anden_rute_bk a " +
                                        "left join bogleveringer.postnummerdistributor d on d.PostNr = a.orgPostnr " + 
                                        "WHERE d.Distributor <> 10057 " +
                                        debugFilter2
                                        ;
                
                try ( Connection conn = DBConnection.getConnection();           
                                Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                                ) {
                        
                
                        stmt.setFetchSize(Integer.MIN_VALUE);
                        
                        ResultSet res = stmt.executeQuery(sql);
                        
                        DeduplicateHelper<String> transportCache = new DeduplicateHelper<String>();
                        
                        List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
                        while (res.next()) {            
                                
                                ExtendedBean eb = new ExtendedBean();
                                eb.orgId = res.getInt(1);
                                eb.targetId = res.getInt(2);
                                eb.afstand = (float) res.getDouble(3);
                                eb.transport = transportCache.getInstance(res.getString(4));
                                                        
                                list.add(eb);
                        }
                        
                        res.close();
                        
                        System.out.println("Loaded " + list.size() + " extendedbeans");
                        
                        return list;
                }
        }
        
        public static Map<Short,HundredePctBean> get100PctList() throws SQLException {
                String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + 
                                         "FROM bogleveringer.adresser_udenfor_daekning";
                
                try ( Connection conn = DBConnection.getConnection();           
                                Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                                ) {
                        ResultSet res = stmt.executeQuery(sql);
        
                        Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>();
                        
                        DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
                        
                        while (res.next()) {
                                
                                
                                HundredePctBean bean = new HundredePctBean();
                                bean.postnr = (short) res.getInt(1);
                                bean.distributor = distributorCache.getInstance(res.getString(2));
                                bean.rute = res.getString(3);
                                bean.koreliste = res.getString(4);
                                bean.dbkBane = (short)res.getInt(5);                    
                                                        
                                map.put(bean.postnr, bean);
                        }
                        
                        res.close();
                        
                        System.out.println("Loaded " + map.size() + " 100pct beans");
                        
                        return map;
                }
                
        }
        
        public static void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException {
                String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' ";
                
                String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, indlast) " +
                                        "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,  NOW() )";
                

                try ( Connection conn = DBConnection.getConnection();
                                Statement setStmt = conn.createStatement();                             
                                PreparedStatement stmt = conn.prepareStatement(sql);
                        ) {
                        
                        setStmt.execute(setVar);
                        
                        
                        stmt.setInt( 1, safeInt(postnr) );
                        stmt.setString( 2, adresse);
                        stmt.setString( 3, result.splitResult.vej);
                        stmt.setString( 4, coalesce(result.googleVej,result.osmVej) );
                        stmt.setString( 5, nullify(result.splitResult.husnr) );
                        stmt.setString( 6, result.splitResult.litra);
                        stmt.setString( 7, result.splitResult.etage);
                        stmt.setString( 8, result.splitResult.lejlighed);
                        stmt.setString( 9, result.splitResult.resten);
                        stmt.setString(10, brugerid);
                        stmt.setInt(11, getStatusInt(result.status) );
                        
                        stmt.executeUpdate();
                        
                }               
        }
        
        /*
         * Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service 
         */
        public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException {
                String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " +
                                "and status IN (10,11,12) " +
                                "group by postnr,adresse "
                                ;

                try ( Connection conn = DBConnection.getConnection();           
                                Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
                                ) {


                        stmt.setFetchSize(Integer.MIN_VALUE);

                        ResultSet res = stmt.executeQuery(sql);

                        List<LoggedAddress> result = new ArrayList<LoggedAddress>();

                        while (res.next()) {
                                LoggedAddress a = new LoggedAddress();                          
                                a.postnr = res.getInt(1);                               
                                a.adresse = res.getString(2);
                                a.status = res.getInt(3);

                                result.add(a);
                        }

                        res.close();

                        return result;
                }
        }
        
        private static int getStatusInt(SearchResult.Status status) {

                switch (status) {
                case ERROR_UNKNOWN_POSTAL:
                        return 20;
                case ERROR_MISSING_HOUSENUMBER:
                        return 21;
                case ERROR_POSTBOX:
                        return 22;                      
                case ERROR_UNKNOWN_STREETNAME:
                        return 23;
                case ERROR_UNKNOWN_ADDRESSPOINT:
                        return 24;
                case STATUS_NOT_COVERED:                        
                        return 25;
                case ERROR_INTERNAL: //                 
                        return 26;                      
                        
                case STATUS_OK:
                        return 30;
                        
                default:
                        return 31;
                }
        }
        
        private static int safeInt(String str) {
                try {
                        return Integer.parseInt( str );
                } catch (NumberFormatException e) {
                        return 0;
                }
        }
        
        private static String nullify(String str) {
                if (str == null)
                        return null;
                
                if (str.equals("")) {
                        return null;
                } else {
                        return str;
                }
        }
        
        private static String coalesce(String s1, String s2) {
                if (s1 != null)
                        return s1;
                
                return s2;
        }

        
}
1	package dk.daoas.daoadresseservice.db;
2
3
4	import java.sql.Connection;
5	import java.sql.PreparedStatement;
6	import java.sql.ResultSet;
7	import java.sql.SQLException;
8	import java.sql.Statement;
9	import java.util.ArrayList;
10	import java.util.HashMap;
11	import java.util.List;
12	import java.util.Map;
13
14	import dk.daoas.daoadresseservice.DaekningsType;
15	import dk.daoas.daoadresseservice.beans.Address;
16	import dk.daoas.daoadresseservice.beans.AliasBean;
17	import dk.daoas.daoadresseservice.beans.ExtendedBean;
18	import dk.daoas.daoadresseservice.beans.HundredePctBean;
19	import dk.daoas.daoadresseservice.beans.LoggedAddress;
20	import dk.daoas.daoadresseservice.beans.SearchResult;
21	import dk.daoas.daoadresseservice.util.DeduplicateHelper;
22
23	public class DatabaseLayer {
24
25	static boolean DEBUG = false;
26
27	public static List<Address> getAllAdresses() throws SQLException {
28	String debugFilter = DatabaseLayer.DEBUG ? " AND postnr = 8700 " : "";
29
30	String sql =
31	"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,latitude,longitude "
32	+ "FROM fulddaekning.adressetabel "
33	+ "WHERE gadeid IS NOT NULL "
34	+ debugFilter
35	;
36
37	try ( Connection conn = DBConnection.getConnection();
38	Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
39	) {
40	stmt.setFetchSize(Integer.MIN_VALUE);
41	ResultSet res = stmt.executeQuery(sql);
42
43	List<Address> list = new ArrayList<Address>(2600000);//initial capacity 2.6 mio
44
45	DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>();
46	DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
47	DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
48	DeduplicateHelper<String> korelisteCache = new DeduplicateHelper<String>();
49	DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
50
51
52	while (res.next()) {
53
54	Address a = new Address();
55	a.id = res.getInt(1);
56	a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
57	a.husnr = (short) res.getInt(3);
58	a.husnrbogstav = husnrbogstavCache.getInstance( res.getString(4) );
59	a.kommunekode = (short) res.getInt(5);
60	a.vejkode = (short)res.getInt(6);
61	a.postnr = (short)res.getInt(7);
62	a.gadeid = res.getInt(8);
63	a.distributor = distributorCache.getInstance(res.getString(9));
64	a.dbkBane = (short) res.getInt(10);
65	a.koreliste = korelisteCache.getInstance( res.getString(11) );
66	a.rute = ruteCache.getInstance( res.getString(12) );
67	a.latitude = (float) res.getDouble(13);
68	a.longitude = (float) res.getDouble(14);
69
70	//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
71
72	if (a.rute != null && a.rute.length()> 0) {
73	a.daekningsType = DaekningsType.DAEKNING_DIREKTE;
74	} else {
75	a.daekningsType = DaekningsType.DAEKNING_IKKEDAEKKET;
76	}
77
78	list.add(a);
79	}
80	res.close();
81	stmt.close();
82	conn.close();
83
84	System.out.println("Loaded " + list.size() + " adresses");
85
86	return list;
87	}
88	}
89
90	public static List<AliasBean> getAliasList() throws SQLException {
91
92
93	String sql = "SELECT postnr,vejnavn,aliasvejnavn " +
94	"FROM bogleveringer.vejtabelprod "
95	;
96
97	try ( Connection conn = DBConnection.getConnection();
98	Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
99	) {
100
101	stmt.setFetchSize(Integer.MIN_VALUE);
102
103	ResultSet res = stmt.executeQuery(sql);
104
105	DeduplicateHelper<String> vejCache = new DeduplicateHelper<String>();
106
107	List<AliasBean> list = new ArrayList<AliasBean>( 5000);
108	while (res.next()) {
109
110	AliasBean ab = new AliasBean();
111	ab.postnr = res.getShort(1);
112	ab.vejnavn = vejCache.getInstance( res.getString(2) );
113	ab.aliasVejnavn = vejCache.getInstance( res.getString(3) );
114
115	list.add(ab);
116	}
117
118	res.close();
119
120	System.out.println("Loaded " + list.size() + " aliase beans");
121
122	return list;
123	}
124
125	}
126
127	public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
128	String debugFilter1 = DatabaseLayer.DEBUG ? " WHERE orgPostnr = 8700 " : "";
129	String debugFilter2 = DatabaseLayer.DEBUG ? " AND orgPostnr = 8700 " : "";
130
131
132	String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " +
133	"join odbc.transporttype t " +
134	"on t.Art = 'Transpost' " +
135	"and ( (t.Type = 'Cykel' and a.Afstand < 1.001) or (t.Type = 'Scooter' and a.Afstand < 1.201) or (t.Type = 'Bil' and a.Afstand < 2.601) ) " +
136	"and t.Rute = a.Rute " +
137	debugFilter1 +
138
139	"UNION ALL " +
140
141	"SELECT orgid, a.id as targetid, afstand,'' as type FROM fulddaekning.afstand_anden_rute_bk a " +
142	"left join bogleveringer.postnummerdistributor d on d.PostNr = a.orgPostnr " +
143	"WHERE d.Distributor <> 10057 " +
144	debugFilter2
145	;
146
147	try ( Connection conn = DBConnection.getConnection();
148	Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
149	) {
150
151
152	stmt.setFetchSize(Integer.MIN_VALUE);
153
154	ResultSet res = stmt.executeQuery(sql);
155
156	DeduplicateHelper<String> transportCache = new DeduplicateHelper<String>();
157
158	List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
159	while (res.next()) {
160
161	ExtendedBean eb = new ExtendedBean();
162	eb.orgId = res.getInt(1);
163	eb.targetId = res.getInt(2);
164	eb.afstand = (float) res.getDouble(3);
165	eb.transport = transportCache.getInstance(res.getString(4));
166
167	list.add(eb);
168	}
169
170	res.close();
171
172	System.out.println("Loaded " + list.size() + " extendedbeans");
173
174	return list;
175	}
176	}
177
178	public static Map<Short,HundredePctBean> get100PctList() throws SQLException {
179	String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " +
180	"FROM bogleveringer.adresser_udenfor_daekning";
181
182	try ( Connection conn = DBConnection.getConnection();
183	Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
184	) {
185	ResultSet res = stmt.executeQuery(sql);
186
187	Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>();
188
189	DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
190
191	while (res.next()) {
192
193
194	HundredePctBean bean = new HundredePctBean();
195	bean.postnr = (short) res.getInt(1);
196	bean.distributor = distributorCache.getInstance(res.getString(2));
197	bean.rute = res.getString(3);
198	bean.koreliste = res.getString(4);
199	bean.dbkBane = (short)res.getInt(5);
200
201	map.put(bean.postnr, bean);
202	}
203
204	res.close();
205
206	System.out.println("Loaded " + map.size() + " 100pct beans");
207
208	return map;
209	}
210
211	}
212
213	public static void saveRequestLog(String brugerid, String postnr, String adresse, SearchResult result) throws SQLException {
214	String setVar = "set sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' ";
215
216	String sql = "INSERT INTO logs.hentruteinformation (postnr,adresse,vejnavn,googlevejnavn,husnr,husnr_bogstav,etage,lejlighed,rest,brugerid,status, indlast) " +
217	"VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW() )";
218
219
220
221	try ( Connection conn = DBConnection.getConnection();
222	Statement setStmt = conn.createStatement();
223	PreparedStatement stmt = conn.prepareStatement(sql);
224	) {
225
226	setStmt.execute(setVar);
227
228
229	stmt.setInt( 1, safeInt(postnr) );
230	stmt.setString( 2, adresse);
231	stmt.setString( 3, result.splitResult.vej);
232	stmt.setString( 4, coalesce(result.googleVej,result.osmVej) );
233	stmt.setString( 5, nullify(result.splitResult.husnr) );
234	stmt.setString( 6, result.splitResult.litra);
235	stmt.setString( 7, result.splitResult.etage);
236	stmt.setString( 8, result.splitResult.lejlighed);
237	stmt.setString( 9, result.splitResult.resten);
238	stmt.setString(10, brugerid);
239	stmt.setInt(11, getStatusInt(result.status) );
240
241	stmt.executeUpdate();
242
243	}
244	}
245
246	/*
247	* Bruges til at sammenligne gammel og ny adresse service - kan fjernes engang efter at vi er skiftet til ny service
248	*/
249	public static List<LoggedAddress> getLoggedAdresses(int antaldage) throws SQLException {
250	String sql = "select postnr,adresse,status from logs.hentruteinformation where indlast>=date_sub(curdate(), interval " + antaldage + " day) " +
251	"and status IN (10,11,12) " +
252	"group by postnr,adresse "
253	;
254
255	try ( Connection conn = DBConnection.getConnection();
256	Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
257	) {
258
259
260	stmt.setFetchSize(Integer.MIN_VALUE);
261
262	ResultSet res = stmt.executeQuery(sql);
263
264	List<LoggedAddress> result = new ArrayList<LoggedAddress>();
265
266	while (res.next()) {
267	LoggedAddress a = new LoggedAddress();
268	a.postnr = res.getInt(1);
269	a.adresse = res.getString(2);
270	a.status = res.getInt(3);
271
272	result.add(a);
273	}
274
275	res.close();
276
277	return result;
278	}
279	}
280
281	private static int getStatusInt(SearchResult.Status status) {
282
283	switch (status) {
284	case ERROR_UNKNOWN_POSTAL:
285	return 20;
286	case ERROR_MISSING_HOUSENUMBER:
287	return 21;
288	case ERROR_POSTBOX:
289	return 22;
290	case ERROR_UNKNOWN_STREETNAME:
291	return 23;
292	case ERROR_UNKNOWN_ADDRESSPOINT:
293	return 24;
294	case STATUS_NOT_COVERED:
295	return 25;
296	case ERROR_INTERNAL: //
297	return 26;
298
299	case STATUS_OK:
300	return 30;
301
302	default:
303	return 31;
304	}
305	}
306
307	private static int safeInt(String str) {
308	try {
309	return Integer.parseInt( str );
310	} catch (NumberFormatException e) {
311	return 0;
312	}
313	}
314
315	private static String nullify(String str) {
316	if (str == null)
317	return null;
318
319	if (str.equals("")) {
320	return null;
321	} else {
322	return str;
323	}
324	}
325
326	private static String coalesce(String s1, String s2) {
327	if (s1 != null)
328	return s1;
329
330	return s2;
331	}
332
333
334	}