![](\"/shared/images/checkboxchecked\")
+ }
+ sub_class narrow
+ }
+ }
+
+db_multirow \
+ -extend {
+ edit_url
+ delete_url
+ } definition definition_select {
+ select vd.id,
+ substr(vd.definition,0,20) as definition,
+ al.label as locale
+ from vocab_definition vd,
+ ad_locales al
+ where vd.word_id = :word_id
+ and al.locale = vd.locale
+ order by sort_order
+
+ } {
+ set edit_url [export_vars -base "definition-edit" { id }]
+ set delete_url [export_vars -base "definition-delete" { id return_url}]
+ }
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/locale-count.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/locale-count.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/locale-count.adp 23 Feb 2004 23:00:05 -0000 1.1
@@ -0,0 +1,2 @@
+
+ }
+ sub_class narrow
+ }
+ }
+
+db_multirow \
+ -extend {
+ edit_url
+ delete_url
+ } phonetic_example phonetic_example_select {
+ select vw.word,
+ vpe.word_id,
+ vpe.comments
+ from vocab_phonetic_example vpe,
+ vocab_word vw
+ where vpe.phonetic_id = :phonetic_id
+ and vw.id = vpe.word_id
+
+ } {
+ set edit_url [export_vars -base "phonetic-example-edit" { {id $word_id} }]
+ set delete_url [export_vars -base "phonetic-example-delete" { {id $word_id} }]
+ }
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/phonetic-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/phonetic-list.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/phonetic-list.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,3 @@
+@phonetic_name@
+![\"Edit\"](\"/resources/acs-subsite/Edit16.gif\")
"
+ } else {
+ set onClick ""
+ set paste_html "$phonetic_symbol"
+ set edit_html ""
+ }
+ }
+
+set phonetic_name [vocab::phonetic_alphabet_for_locale -locale $phonetic_locale]
+
+if { [exists_and_not_null csv] } {
+ template::list::write_csv -name phonetic_list
+}
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/sentence-count.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/sentence-count.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/sentence-count.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,2 @@
+
+ }
+ sub_class narrow
+ }
+ } \
+ -filters {
+ locale {
+ label "Locale"
+ where_clause {
+ al.locale = :locale
+ }
+ values {
+ [vocab::locale_list]
+ }
+ }
+ }
+
+
+db_multirow \
+ -extend {
+ edit_url
+ delete_url
+ } sentences sentences_select "
+ select ci.item_id as id,
+ al.label as locale,
+ substring(cr.content,0,30) as text
+ from cr_items ci,
+ cr_revisions cr,
+ ad_locales al,
+ vocab_sentence vs
+ where ci.content_type = 'vocab_sentence'
+ and cr.revision_id = ci.live_revision
+ and vs.id = ci.live_revision
+ and al.locale = vs.locale2
+ [template::list::filter_where_clauses -name sentences -and]
+ order by vs.sort_order
+ " {
+ set edit_url [export_vars -base "sentence-edit" {id}]
+ set delete_url [export_vars -base "sentence-delete" {id}]
+ }
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/sentence-train-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/sentence-train-list.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/sentence-train-list.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,2 @@
+
+ }
+ sub_class narrow
+ }
+ } \
+ -filters {
+ locale {
+ label "Locale"
+ where_clause {
+ al.locale = :locale
+ }
+ values {
+ [vocab::locale_list]
+ }
+ }
+ }
+
+if { [exists_and_not_null group] } {
+ set group_clause " and ci.item_id in (select subject_id from vocab_test_subject where test_id = :group)"
+} else {
+ set group_clause ""
+}
+
+db_multirow \
+ -extend {
+ on_list_html
+ edit_url
+ } sentences sentence_select "
+ select ci.item_id as id,
+ vs.sort_order,
+ cr.content as sentence,
+ al.label as locale,
+ coalesce((select 1
+ from vocab_test
+ where test_type='sentence'
+ and test_subject = ci.item_id),0) as on_list
+ from vocab_sentence vs,
+ cr_items ci,
+ cr_revisions cr,
+ ad_locales al
+ where ci.content_type = 'vocab_sentence'
+ and cr.revision_id = ci.live_revision
+ and vs.id = ci.live_revision
+ and al.locale = vs.locale2
+ $group_clause
+ [template::list::filter_where_clauses -name sentences -and]
+ [template::list::orderby_clause -name sentences -orderby]
+ " {
+ set delete_url [export_vars -base "test-delete" {id return_url}]
+ set edit_url [export_vars -base "${vocab_url}sentence-edit" {id return_url}]
+ set add_url [export_vars -base "sentence-add" {id return_url}]
+ if { $on_list } {
+ set on_list_html ""
+ } else {
+ set on_list_html ""
+ }
+ }
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/test-count.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/test-count.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/test-count.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,2 @@
+
+ }
+ sub_class narrow
+ }
+ } \
+ -filters {
+ locale_filter {
+ label "Locale"
+ where_clause {
+ vt.locale_a = :locale_filter
+ }
+ values {
+ [vocab::locale_list]
+ }
+ }
+ test_type {
+ label "Test Type"
+ where_clause {
+ vt.test_type = :test_type_filter
+ }
+ values {
+ [vocab::train::test_type_list]
+ }
+ }
+ }
+
+db_multirow -extend { test_url test_train_add_url test_train_delete_url on_list_html test_delete_url } tests select_tests "
+ select vt.id,
+ vt.test_type,
+ coalesce((select 1
+ from vocab_user_test_map
+ where test_id = vt.id
+ and user_id = :user_id),0) as on_list,
+ question,
+ coalesce((select count(*)
+ from vocab_test_result
+ where test_id = vt.id
+ and user_id = :user_id),0) as result_count,
+ coalesce((select sum(result1)
+ from vocab_test_result
+ where test_id = vt.id
+ and user_id = :user_id),0) as result_sum
+ from vocab_test vt
+ where package_id = :package_id
+ [template::list::filter_where_clauses -name tests -and]
+ [template::list::orderby_clause -name tests -orderby]
+limit 500
+" {
+ set test_train_add_url [export_vars -base "test-train-add" {id return_url}]
+ set test_train_delete_url [export_vars -base "test-train-delete" {id return_url}]
+ set test_url [export_vars -base "test" {{test_id $id} test_type }]
+ set test_delete_url [export_vars -base "test-delete" {id return_url}]
+
+ if { $on_list } {
+ set on_list_html ""
+ } else {
+ set on_list_html "![](\"/shared/images/checkbox\")
"
+ }
+
+}
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/lib/test-user-count.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/test-user-count.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/test-user-count.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,2 @@
+|
+ |
+
+ |
+
+ }
+ sub_class narrow
+ }
+
+ } \
+ -filters {
+ locale {
+ label "Locale"
+ where_clause {
+ al.locale = :locale
+ }
+ values {
+ [vocab::locale_list]
+ }
+ }
+ paginate {
+ label "Letter"
+ where_clause "
+ (vw.word like :paginate_like or vw.local_phonetic like :paginate_like)
+ "
+ values {
+ [vocab::letter_list]
+ }
+ }
+ }
+
+db_multirow \
+ -extend {
+ edit_url
+ delete_url
+ on_list_html
+ } words word_select "
+ select vw.id,
+ vw.word,
+ al.label as label,
+ coalesce(local_phonetic,ipa_phonetic) as phonetic,
+ (select substring(definition,0,20)
+ from vocab_definition
+ where word_id = vw.id
+ and locale = :locale_b
+ limit 1) as definition,
+ coalesce((select 1
+ from vocab_word_list
+ where word_id = vw.id
+ and user_id = :user_id
+ and package_id = :package_id),0) as on_list
+ from vocab_word vw,
+ ad_locales al
+ where vw.package_id = :package_id
+ and al.locale = vw.locale
+ [template::list::filter_where_clauses -name words -and]
+ [template::list::orderby_clause -name words -orderby]
+ " {
+ set edit_url [export_vars -base "word-edit" {id}]
+ set delete_url [export_vars -base "word-delete" {id return_url}]
+
+ set delete_train_url [export_vars -base "word-train-delete" {id return_url}]
+ set add_train_url [export_vars -base "word-train-add" {id return_url}]
+ if { $on_list } {
+ set on_list_html "[vocab::img::checkedbox]"
+ } else {
+ set on_list_html "[vocab::img::checkbox]"
+ }
+ }
+
Index: openacs-4/contrib/packages/vocabulary/lib/word-train-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/word-train-list.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/lib/word-train-list.adp 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,2 @@
+"
+ } else {
+ set on_list_html ""
+ }
+ }
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/ipa.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/ipa.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/ipa.sql 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,55 @@
+--
+-- PostgreSQL database dump
+--
+
+COPY vocab_phonetic (id, locale, sort_order, phonetic_symbol) FROM stdin;
+8 \N \N ʌ
+9 \N \N ɑ
+10 \N \N æ
+11 \N \N e
+12 \N \N ə
+13 \N \N ɪ
+14 \N \N i
+15 \N \N u
+16 \N \N o
+17 \N \N ɔ
+18 \N \N ð
+19 \N \N p
+20 \N \N b
+21 \N \N t
+22 \N \N d
+23 \N \N k
+24 \N \N g
+25 \N \N m
+26 \N \N n
+27 \N \N f
+28 \N \N v
+29 \N \N s
+30 \N \N h
+31 \N \N l
+32 \N \N w
+33 \N \N ʙ
+34 \N \N ɐ
+35 \N \N ɒ
+36 \N \N ɓ
+37 \N \N β
+38 \N \N ɕ
+39 \N \N ç
+40 \N \N ɗ
+41 \N \N ɖ
+42 \N \N ʤ
+43 \N \N ˈ
+44 \N \N ˌ
+45 \N \N ʴ
+46 \N \N ̚
+47 \N \N ɛ
+48 \N \N ŋ
+49 \N \N ʒ
+50 \N \N j
+51 \N \N ʃ
+52 \N \N θ
+\.
+
+SELECT pg_catalog.setval ('vocab_phonetic_id_seq', 52, true);
+
+
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-create.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-create.sql 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,10 @@
+--
+
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-create.sql,v 1.1 2004/02/23 23:00:06 joela Exp $
+--
+
+\i vocabulary-tables-create.sql
+\i vocabulary-train-tables-create.sql
+\i ipa.sql
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-drop.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-drop.sql 23 Feb 2004 23:00:06 -0000 1.1
@@ -0,0 +1,8 @@
+--
+
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-drop.sql,v 1.1 2004/02/23 23:00:06 joela Exp $
+--
+\i vocabulary-train-tables-drop.sql
+\i vocabulary-tables-drop.sql
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-create.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-create.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,215 @@
+--
+
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-tables-create.sql,v 1.1 2004/02/23 23:00:07 joela Exp $
+--
+
+select acs_object_type__create_type (
+ 'vocab_word', -- object_type
+ 'word', -- pretty_name
+ 'words', -- pretty_plural
+ 'acs_object', -- supertype
+ 'vocab_word', -- table_name
+ 'id', -- id_column
+ null, -- package_name
+ 'f', -- abstract_p
+ null, -- type_extension_table
+ 'vocab_word__name' -- name_method
+);
+
+create table vocab_word (
+ id integer
+ constraint vocab_word_id_fk
+ references acs_objects(object_id)
+ constraint vocab_word_pk
+ primary key,
+ word varchar(50)
+ not null,
+ locale varchar(30)
+ constraint vocab_word_locale_fk
+ references ad_locales,
+ ipa_phonetic varchar(100),
+ local_phonetic varchar(100),
+ package_id integer
+ not null
+ constraint vocab_word_package_id_fk
+ references apm_packages
+);
+
+comment on table vocab_word is '
+Each record is a single word in a single locale. Homonyms should have their own entries.';
+
+comment on column vocab_word.word is 'The spelling of the word in its native character set. Should be unicode.';
+
+comment on column vocab_word.ipa_phonetic is 'International Phonetic Alphabet spelling.';
+
+comment on column vocab_word.local_phonetic is 'Spelling in appropriate phonetic alphabet.';
+
+create or replace function vocab_word__name (integer)
+returns varchar as '
+declare
+ p_id alias for $1;
+ v_name varchar;
+begin
+ select word into v_name
+ from vocab_word
+ where id = p_id;
+ return v_name;
+end;
+' language 'plpgsql';
+
+create or replace function vocab_word__new (
+ integer, -- package_id
+ varchar, -- word
+ varchar, -- locale
+ varchar, -- ipa_phonetic
+ varchar, -- local_phonetic
+ integer, -- creation_user
+ varchar -- creation_ip
+) returns integer as '
+declare
+ p_package_id alias for $1;
+ p_word alias for $2;
+ p_locale alias for $3;
+ p_ipa_phonetic alias for $4;
+ p_local_phonetic alias for $5;
+ p_creation_user alias for $6;
+ p_creation_ip alias for $7;
+ v_id integer;
+begin
+ v_id := acs_object__new (
+ null,
+ ''vocab_word'',
+ current_timestamp,
+ p_creation_user,
+ p_creation_ip,
+ p_package_id
+ );
+
+ insert into vocab_word (
+ id,
+ package_id,
+ word,
+ locale,
+ ipa_phonetic,
+ local_phonetic
+ ) values (
+ v_id,
+ p_package_id,
+ p_word,
+ p_locale,
+ p_ipa_phonetic,
+ p_local_phonetic
+ );
+
+ PERFORM acs_permission__grant_permission(
+ v_id,
+ p_creation_user,
+ ''admin''
+ );
+
+ return v_id;
+end;
+' language 'plpgsql';
+
+create or replace function vocab_word__delete (integer)
+returns integer as '
+declare
+ p_id alias for $1;
+begin
+ delete from vocab_word
+ where id = p_id;
+ PERFORM acs_object__delete(p_id);
+ return 0;
+
+end;
+' language 'plpgsql';
+
+create table vocab_definition (
+ id serial
+ constraint vocab_def_pk
+ primary key,
+ word_id integer
+ constraint vocab_def_word_fk
+ references vocab_word,
+ sort_order integer,
+ locale varchar(30)
+ constraint vocab_word_locale_fk
+ references ad_locales,
+ definition text,
+ unique (word_id, locale, sort_order)
+);
+
+comment on table vocab_definition is 'Each record is one definition of one word in one locale. This means that definitions are arbitrary text instead of links to other words. TODO: Perhaps we should optionally link to another word here. so that a definition can be more or less structured.';
+
+create table vocab_phonetic (
+ id serial
+ constraint vocab_phonetic_pk
+ primary key,
+ phonetic_symbol varchar(5),
+ locale varchar(30)
+ constraint vocab_word_locale_fk
+ references ad_locales,
+ sort_order integer
+ );
+
+comment on table vocab_phonetic is 'Each record is a letter in a phonetic alphabet. Deliberately package_ignorant.';
+
+comment on column vocab_phonetic.locale is 'Null is assumed to be IPA.';
+
+create table vocab_phonetic_example (
+ id serial
+ constraint vocab_phonetic_example_pk
+ primary key,
+ phonetic_id integer
+ constraint vocab_phonetic_phonetic_fk
+ references vocab_phonetic,
+ word_id integer
+ constraint vocab_phonetic_word_fk
+ references vocab_word,
+ comments varchar(100),
+ unique (phonetic_id, word_id)
+);
+
+comment on table vocab_phonetic_example is 'Each record is a word with contains a sound of an PHONETIC symbol. Each record is indirectly locale-specific and package-specific, via word. Since we can auto-generate some of this via direct lookup of phonetic symbols within word text, this table is semi-superfluous. It might see life again holding additional or special comments.';
+
+select content_type__create_type(
+ 'vocab_sentence', -- content_type
+ 'content_revision', -- supertype
+ 'sentence', -- pretty_name,
+ 'sentences', -- pretty_plural
+ 'vocab_sentence', -- table_name
+ 'id', -- id_column
+ null -- name_method
+);
+
+-- we have to create a custom locale field because locale in cr_items
+-- is varchar(4), even though ad_locales locale is varchar(30)
+-- TODO: make this FK to ad_locales
+select content_type__create_attribute(
+ 'vocab_sentence', -- content_type
+ 'locale2', -- attribute_name
+ 'string', -- datatype
+ 'Locale', -- pretty_name
+ 'Locales', -- pretty_plural
+ 1, -- sort_order
+ null, -- default_value
+ 'varchar(30)' -- column_spec
+);
+
+select content_type__create_attribute(
+ 'vocab_sentence', -- content_type
+ 'sort_order', -- attribute_name
+ 'integer', -- datatype
+ 'Sort Order', -- pretty_name
+ 'Sort Orders', -- pretty_plural
+ 2, -- sort_order
+ null, -- default_value
+ 'integer' -- column_spec
+);
+
+-- necessary to work around limitation of content repository:
+select content_folder__register_content_type(-100,'vocab_sentence','t');
+
+create sequence vocab_sentence_name_seq;
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-drop.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-tables-drop.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,34 @@
+--
+
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-tables-drop.sql,v 1.1 2004/02/23 23:00:07 joela Exp $
+--
+
+
+select content_type__drop_type(
+ 'vocab_sentence',
+ 't',
+ 't'
+);
+
+drop table vocab_phonetic_example;
+drop table vocab_phonetic;
+drop table vocab_definition;
+
+drop function vocab_word__name (integer);
+drop function vocab_word__new(
+ integer, -- id
+ integer, -- package_id
+ varchar, -- word
+ varchar, -- locale
+ varchar, -- ipa_phonetic
+ varchar, -- local_phonetic
+ timestamptz, -- entry_date
+ integer, -- creation_user
+ varchar -- creation_ip
+);
+drop function vocab_word__delete (integer);
+
+drop table vocab_word;
+select acs_object_type__drop_type ('vocab_word', true);
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-create.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-create.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,93 @@
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-train-tables-create.sql,v 1.1 2004/02/23 23:00:07 joela Exp $
+--
+
+create table vocab_word_list (
+ id serial
+ primary key,
+ user_id integer
+ not null
+ references users,
+ word_id integer
+ not null
+ references vocab_word,
+ locale varchar(30)
+ references ad_locales,
+ date_added timestamptz,
+ package_id integer
+ not null
+ references apm_packages,
+ unique (user_id, word_id, package_id)
+);
+
+comment on table vocab_word_list is '
+Each record is one word which one user has been assigned.';
+
+create table vocab_test (
+ id serial
+ primary key,
+ test_type varchar(30)
+ not null,
+ test_subject integer,
+ question text,
+ answer text,
+ locale_a varchar(30)
+ references ad_locales,
+ locale_b varchar(30)
+ references ad_locales,
+ package_id integer
+ not null
+ references apm_packages
+);
+
+comment on table vocab_test is '
+Each record is one test. Question and Answer may be null, which implies they are derived; or populated, which could be unique data or caching, depending on the test type.';
+
+comment on column vocab_test.test_subject is '
+Depending on test_type, this is the id of a word, sentence, or other object.';
+
+create table vocab_test_subject (
+ test_id integer
+ not null
+ references vocab_test (id),
+ subject_id integer,
+ unique (test_id, subject_id)
+);
+
+comment on table vocab_test_subject is '
+If a test has multiple subjects, store them here.';
+
+create table vocab_user_test_map (
+ id serial
+ primary key,
+ user_id integer
+ not null
+ references users,
+ test_id integer
+ not null
+ references vocab_test (id),
+ date_added timestamptz,
+ unique (user_id, test_id)
+);
+
+comment on table vocab_user_test_map is '
+Each record is the assignment of one test to one user.';
+
+
+create table vocab_test_result (
+ test_id integer
+ not null
+ references vocab_test (id),
+ user_id integer
+ not null
+ references users,
+ date timestamptz,
+ answer1 varchar(500),
+ result1 integer,
+ answer2 varchar(500),
+ result2 integer,
+ answer3 varchar(500),
+ result3 integer
+);
+
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-drop.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/vocabulary-train-tables-drop.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,10 @@
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-01
+-- @cvs-id $Id: vocabulary-train-tables-drop.sql,v 1.1 2004/02/23 23:00:07 joela Exp $
+--
+
+drop table vocab_test_result;
+drop table vocab_test_subject;
+drop table vocab_user_test_map;
+drop table vocab_test;
+drop table vocab_word_list;
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.4-0.5d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.4-0.5d1.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.4-0.5d1.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,4 @@
+alter table vocab_phonetic rename column phonetic_symbol to phonetic_symbol_old;
+alter table vocab_phonetic add column phonetic_symbol varchar(5);
+update vocab_phonetic set phonetic_symbol=phonetic_symbol_old;
+alter table vocab_phonetic drop column phonetic_symbol_old;
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.5d1-0.5d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.5d1-0.5d2.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.5d1-0.5d2.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,47 @@
+select content_type__create_type(
+ 'vocab_sentence', -- content_type
+ 'content_revision', -- supertype
+ 'sentence', -- pretty_name,
+ 'sentences', -- pretty_plural
+ 'vocab_sentence', -- table_name
+ 'id', -- id_column
+ null -- name_method
+);
+
+select content_type__create_attribute(
+ 'vocab_sentence', -- content_type
+ 'locale2', -- attribute_name
+ 'string', -- datatype
+ 'Locale', -- pretty_name
+ 'Locales', -- pretty_plural
+ 1, -- sort_order
+ null, -- default_value
+ 'varchar(30)' -- column_spec
+);
+
+select content_type__create_attribute(
+ 'vocab_sentence', -- content_type
+ 'sort_order', -- attribute_name
+ 'integer', -- datatype
+ 'Sort Order', -- pretty_name
+ 'Sort Orders', -- pretty_plural
+ 2, -- sort_order
+ null, -- default_value
+ 'integer' -- column_spec
+);
+
+select content_type__create_attribute(
+ 'vocab_sentence', -- content_type
+ 'hint', -- attribute_name
+ 'string', -- datatype
+ 'Hint', -- pretty_name
+ 'Hints', -- pretty_plural
+ 3, -- sort_order
+ null, -- default_value
+ 'varchar(100)' -- column_spec
+);
+
+-- necessary to work around limitation of content repository:
+select content_folder__register_content_type(-100,'vocab_sentence','t');
+
+create sequence vocab_sentence_name_seq;
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.6-0.7.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.6-0.7.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.6-0.7.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,7 @@
+select content_type__drop_attribute(
+ 'vocab_sentence', -- content_type
+ 'hint', -- attribute_name
+ 't' -- drop_column
+);
+
+\i ../vocabulary-train-tables-create.sql
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.7-0.8.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.7-0.8.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/sql/postgresql/upgrade/upgrade-0.7-0.8.sql 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,20 @@
+--
+-- packages/vocabulary/sql/postgresql/upgrade/upgrade-0.7-0.8.sql
+--
+-- @author Joel Aufrecht (joel@aufrecht.org)
+-- @creation-date 2004-02-21
+-- @cvs-id $Id: upgrade-0.7-0.8.sql,v 1.1 2004/02/23 23:00:07 joela Exp $
+--
+
+create or replace function vocab_word__delete (integer)
+returns integer as '
+declare
+ p_id alias for $1;
+begin
+ delete from vocab_word
+ where id = p_id;
+ PERFORM acs_object__delete(p_id);
+ return 0;
+
+end;
+' language 'plpgsql';
Index: openacs-4/contrib/packages/vocabulary/tcl/sentence-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/sentence-procs.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/tcl/sentence-procs.tcl 23 Feb 2004 23:00:07 -0000 1.1
@@ -0,0 +1,141 @@
+# packages/vocabulary/tcl/vocabulary-sentence.tcl
+
+ad_library {
+
+ Procs for sentences.
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-22
+ @cvs-id $Id: sentence-procs.tcl,v 1.1 2004/02/23 23:00:07 joela Exp $
+
+}
+
+
+#####################################################################
+# vocab::sentence
+######################################################################
+
+namespace eval vocab::sentence {}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::sentence::get {
+ -id:required
+ -array:required
+} {
+ Retrieve a sentence
+ @param id The id of the sentence
+ @array The name of an array to populate with sentence data
+
+ @return 0 for success, -1 if no row
+} {
+ upvar 1 $array row
+ set got_sentence [db_0or1row sentence_select {
+ select vs.locale2 as locale,
+ cr.content as text
+ from cr_items ci,
+ cr_revisions cr,
+ vocab_sentence vs
+ where ci.item_id = :id
+ and cr.revision_id = ci.live_revision
+ and vs.id = ci.live_revision
+ } -column_array row]
+ if { $got_sentence } {
+ return 0
+ } else {
+ return -1
+ }
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::sentence::new {
+ -user_id:required
+ -package_id:required
+ -text:required
+ -locale:required
+ -word_list
+ -group
+ {-sort_order 0}
+} {
+ This proc adds a sentence.
+
+ @param word_list The name of a list to populate with the sentence's words.
+ @param group The id of a test of type 'sentence_group' to associate this sentence with.
+ @return new sentence object id.
+} {
+
+ set name vocab_sentence[db_nextval vocab_sentence_name_seq]
+ db_transaction {
+ set id [db_string sentence_insert {
+ select content_item__new(:name,-100,null,null,null,:user_id,:package_id,null,'content_item','vocab_sentence',null,null,null,null,null)
+ }]
+
+ set revision_id [db_nextval acs_object_id_seq]
+ if { $sort_order == 0} {
+ set sort_order [db_string get_next_sort "
+ select max(sort_order) + 1
+ from vocab_sentence"]
+ }
+ db_dml revision_add {
+ insert into vocab_sentencei (item_id, revision_id, text, locale2, sort_order)
+ values (:id, :revision_id, :text, :locale, :sort_order)
+ }
+
+ db_exec_plsql make_live {
+ select content_item__set_live_revision(:revision_id)
+ }
+
+ # should probably regexp for all non-alpha
+ if { [exists_and_not_null word_list] } {
+ upvar 1 $word_list extracted_words
+ foreach word [split $text {.;,! ?}] {
+ if {[exists_and_not_null word] } {
+ lappend extracted_words [string tolower $word]
+ }
+ }
+ } else {
+ set extracted_words [list]
+ }
+
+ }
+ return $id
+}
+
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::sentence::edit {
+ -id:required
+ -text:required
+ -locale:required
+ {-sort_order 0}
+} {
+ This proc edits a sentence.
+ @return the id of the sentence.
+} {
+ db_transaction {
+ set revision_id [db_nextval acs_object_id_seq]
+
+ db_dml revision_add {
+ insert into vocab_sentencei (item_id, revision_id, text, locale2, sort_order)
+ values (:id, :revision_id, :text, :locale, :sort_order)
+ }
+
+ db_exec_plsql make_live {
+ select content_item__set_live_revision(:revision_id)
+ }
+ }
+ return $id
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::sentence::delete {
+ -id:required
+} {
+ This proc deletes a sentence.
+ @return 0 for success
+} {
+ auth::require_login
+ db_exec_plsql note_delete {
+ select content_item__delete(:id)
+ }
+ return 0
+}
Index: openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl 23 Feb 2004 23:00:08 -0000 1.1
@@ -0,0 +1,373 @@
+ad_library {
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-20
+ @cvs-id $Id: util-procs.tcl,v 1.1 2004/02/23 23:00:08 joela Exp $
+
+}
+
+######################################################################
+# vocab
+######################################################################
+
+namespace eval vocab {}
+
+######################################################################
+ad_proc -public vocab::subnav_prep {
+ -package_id
+} {
+ Build html for package-specific navigation. This is architecturally dirty,
+ because we should use an adp includelet instead, but this will do for now.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-09
+ @return html
+
+} {
+ # for now, cheat and grab these variables from the ether. This is bad
+ # because it assumes vocab::conn is always called before this proc
+ # hmm, maybe it's better to call vocab::conn from here? naw, that
+ # would make all the upvaring confusing
+ upvar label_a label_a
+ upvar label_b label_b
+
+ set base_url [apm_package_url_from_key vocabulary]
+ set locale_url [export_vars -base "locale"]
+
+ lappend linklist [list [export_vars -base ${base_url}word-list] "Words"]
+ lappend linklist [list [export_vars -base ${base_url}sentence-list] "Sentences"]
+ lappend linklist [list [export_vars -base ${base_url}test-list] "Tests"]
+ lappend linklist [list [export_vars -base ${base_url}test] "Random Test"]
+ lappend linklist [list [export_vars -base ${base_url}$locale_url] "($label_a"]
+ lappend linklist [list [export_vars -base ${base_url}$locale_url] "--> $label_b)"]
+ if { [permission::permission_p -object_id $package_id -privilege admin]} {
+ lappend linklist { admin/ "Admin"}
+ }
+ lappend linklist [list [export_vars -base ${base_url}doc] "Help"]
+
+ foreach link $linklist {
+ lappend subnav "[lindex $link 1]"
+ }
+
+ set subnav [join $subnav " "]
+
+ return $subnav
+}
+
+######################################################################
+ad_proc -public vocab::conn {
+} {
+ Set some variables that might be in cookies or might be passed in.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-09
+ @return 0 for success, and upvar some variables.
+} {
+ upvar package_id package_id
+ upvar user_id user_id
+ set user_id [auth::get_user_id]
+ if { ![exists_and_not_null package_id]} {
+ set package_id [ad_conn package_id]
+ }
+
+ upvar locale_a locale_a
+ upvar locale_b locale_b
+ upvar label_a label_a
+ upvar label_b label_b
+
+ set locale [lang::user::locale -package_id $package_id ]
+ if { ![exists_and_not_null locale_a] } {
+ set locale_a [ad_get_cookie locale_a $locale]
+ }
+
+ if { ![exists_and_not_null locale_b] } {
+ set locale_b [ad_get_cookie locale_b $locale]
+ }
+
+ # since these are tamper_susceptible cookies, check them for bad data
+ if { [catch {set label_a [ad_locale_get_label $locale_a] } ] } {
+ set locale_a [lang::user::locale]
+ set label_a [ad_locale_get_label $locale_a ]
+ }
+
+ if { [catch {set label_b [ad_locale_get_label $locale_b] } ] } {
+ set locale_b [lang::user::locale]
+ set label_b [ad_locale_get_label $locale_b ]
+ }
+
+ return 0
+}
+
+######################################################################
+ad_proc -public vocab::locale_list {
+ {-all}
+} {
+ Get a list of all locales in use
+ TODO: not package_aware
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-02
+ @return list of pairs of label and locale
+} {
+
+ if {[exists_and_not_null all] } {
+ set where_clause ""
+ } else {
+ set where_clause "where al.locale in (select distinct locale
+ from vocab_word
+ UNION
+ select distinct locale2
+ from vocab_sentence) "
+ }
+ return [db_list_of_lists locales "
+ select al.label,
+ al.locale
+ from ad_locales al
+ $where_clause
+ order by label"]
+}
+
+
+######################################################################
+ad_proc -public vocab::letter_list {
+} {
+ Cheesy proc used for half-assed pagination
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-22
+ @return list of pairs of letters and labels
+} {
+ set result [list]
+ foreach letter {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
+ lappend result [list $letter $letter]
+ }
+ return $result
+}
+
+######################################################################
+ad_proc -public vocab::phonetic_alphabet_for_locale {
+ {-locale ""}
+} {
+ This could theoretically be an extra attribute in locales, or even a new table to allow multiple phonetic alphabets per locale, but this is simpler:
+
+ @return name of phonetic alphabet for locale
+} {
+ return [switch $locale {
+ "" {format "International Phonetic Alphabet"}
+ da_DK {format "Dania"}
+ en_US {format "none"}
+ ch_ZH {format "Pinyin"}
+ ch_zh {format "Pinyin"}
+ default {format "Phonetic Alphabet for $locale"}
+ }]
+}
+
+
+
+ad_proc -public vocab::csv2list {
+ -str
+ {-sepChar ,}
+} {
+ Split a CSV into a list.
+ http://mini.net/tcl/721.html
+
+ @return A list.
+} {
+ regsub -all {(\A\"|\"\Z)} $str \0 str
+ set str [string map [list $sepChar\"\"\" $sepChar\0\" \
+ \"\"\"$sepChar \"\0$sepChar \
+ $sepChar\"\"$sepChar $sepChar$sepChar \
+ \"\" \" \" \0 ] $str]
+ set end 0
+ while {[regexp -indices -start $end {(\0)[^\0]*(\0)} $str \
+ -> start end]} {
+ set start [lindex $start 0]
+ set end [lindex $end 0]
+ set range [string range $str $start $end]
+ set first [string first $sepChar $range]
+ if {$first >= 0} {
+ set str [string replace $str $start $end \
+ [string map [list $sepChar \1] $range]]
+ }
+ incr end
+ }
+ set str [string map [list $sepChar \0 \1 $sepChar \0 {} ] $str]
+ return [split $str \0]
+}
+
+######################################################################
+# vocab::locale
+######################################################################
+
+namespace eval vocab::locale {}
+
+ad_proc -public vocab::locale::pinyin_num_to_unicode {
+ -string:required
+} {
+ Replaces pinyin in plain ascii and numbers for tone markers with Unicode. Inspired by:
+
+ Pinyin to Unicode Converter
+ Copyright (C) 2002 Konrad Mitchell Lawson
+ http://www.foolsworkshop.com/
+ http://konrad.lawson.net/
+
+ @return A unicode string.
+} {
+ ####################################
+ # step 1:
+ # deal with any ending consonants before the tone number
+ # ie, turn cian1 into cia1n
+ # 1 is a preceeding vowel, if any, in a multi-vowel set
+ # 2 should be exactly one vowel (assume the last vowel is always the
+ # one to get the tone)
+ # 3 is anything after the last vowel and before the first number
+ # 4 is exactly 1 number between 1 and 4
+
+ regsub -all {([aeiou]*)([aeiou]{1}?)(.*)([1-4]{1}?)} $string {\1\2\4\3} newstring
+ # (1 )(2 )(3 )(4 )
+
+ ####################################
+ # step 2:
+ # convert numeric pinyin to Unicode
+
+ array set charMap {
+ a1 ā
+ a2 á
+ a3 ǎ
+ a4 à
+ e1 ē
+ e2 é
+ e3 ě
+ e4 è
+ i1 ī
+ i2 í
+ i3 ǐ
+ i4 ì
+ o1 ō
+ o2 ó
+ o3 ǒ
+ o4 ò
+ u1 ū
+ u2 ú
+ u3 ǔ
+ u4 ù
+ ü1 ǖ
+ ü2 ǘ
+ ü3 ǚ
+ ü4 ǜ
+ }
+
+ set string_unicode [string map -nocase [array get charMap] $newstring]
+ return $string_unicode
+}
+
+ad_proc -public vocab::locale::moby_ascii_to_ipa {
+ -string:required
+} {
+
+ Replaces moby's ascii representation of IPA with unicode. Depending on how standard moby's ascii ipa is, this could be pretty general. This is the second one of these; maybe I should build a general framework proc. Oh head, and this is INCOMPLETEly implemented at the moment. (Thanks emacs for making it nearly impossible to open, edit, and save a simple utf-8 file!)
+ http://www.dcs.shef.ac.uk/research/ilash/Moby/mpron.html
+
+} {
+
+ # should stress markers go before or after the modified letter?
+ # leave it alone for now, but maybe fix it later
+ # there's a good chance that this regsub will fix it:
+ # regsub -all {.*{1}?)([12]{1}?)} $string {\2\1} newstring
+
+ array set charMap {
+ 0 {}
+ 1
+ 2
+ & æ
+ }
+# (@) "a" in "air"
+# A "a" in "far"
+# eI "a" in "day"
+# @ "a" in "ado"
+# or the glide "e" in "system" (dipthong schwa)
+# - "ir" glide in "tire"
+# or the "dl" glide in "handle"
+# or the "den" glide in "sodden" (dipthong little schwa)
+# b "b" in "nab"
+# tS "ch" in "ouch"
+# d "d" in "pod"
+# E "e" in "red"
+# i "e" in "see"
+# f "f" in "elf"
+# g "g" in "fig"
+# h "h" in "had"
+# hw "w" in "white"
+# I "i" in "hid"
+# aI "i" in "ice"
+# dZ "g" in "vegetably"
+# k "c" in "act"
+# l "l" in "ail"
+# m "m" in "aim"
+# N "ng" in "bang"
+# n "n" in "and"
+# Oi "oi" in "oil"
+# A "o" in "bob"
+# AU "ow" in "how"
+# O "o" in "dog"
+# oU "o" in "boat"
+# u "oo" in "too"
+# U "oo" in "book"
+# p "p" in "imp"
+# r "r" in "ire"
+# S "sh" in "she"
+# s "s" in "sip"
+# T "th" in "bath"
+# D "th" in "the"
+# t "t" in "tap"
+# @ "u" in "cup"
+# @r "u" in "burn"
+# v "v" in "average"
+# w "w" in "win"
+# j "y" in "you"
+
+# Z "s" in "vision"
+# z "z" in "zoo"
+
+# Stress or emphasis is marked in the data with the primary "'" or secondary "," marks: "'" (uncurled apostrophe) marks primary stress "," (comma) marks secondary stress. Moby Pronunciator contains many common names and phrases borrowed from other languages; special sounds include (case is significant):
+
+# "A" "a" in "ami"
+# "N" "n" in "Francoise"
+# "R" "r" in "Der"
+# x "ch" in "Bach"
+# y "eu" in "cordon bleu"
+# "Y" "u" in "Dubois"
+
+ set string_unicode [string map -nocase [array get charMap] $newstring]
+ return $string_unicode
+}
+
+
+######################################################################
+# vocab::img
+######################################################################
+
+namespace eval vocab::img {}
+
+
+ad_proc -public vocab::img::checkedbox {
+} {
+ @return HTML for a checked checkbox image
+} {
+ return {
}
+}
+
+ad_proc -public vocab::img::checkbox {
+} {
+ @return HTML for a checkbox image
+} {
+ return {
}
+}
+
+ad_proc -public vocab::img::help {
+} {
+ @return HTML for help icon
+} {
+ return {![[i]](/shared/images/info.gif "Help text"){kind=small}
}
+}
+
Index: openacs-4/contrib/packages/vocabulary/tcl/vocabulary-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/vocabulary-procs.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/tcl/vocabulary-procs.tcl 23 Feb 2004 23:00:08 -0000 1.1
@@ -0,0 +1,272 @@
+# packages/vocabulary/tcl/vocabulary-procs.tcl
+
+ad_library {
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-02
+ @cvs-id $Id: vocabulary-procs.tcl,v 1.1 2004/02/23 23:00:08 joela Exp $
+
+}
+
+#####################################################################
+# vocab
+######################################################################
+
+namespace eval vocab {}
+
+#####################################################################
+# vocab::word
+######################################################################
+
+namespace eval vocab::word {}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::new {
+ -package_id:required
+ -word:required
+ -locale:required
+ -user_id:required
+ {-ipa_phonetic ""}
+ {-local_phonetic ""}
+ {-def_locale ""}
+ {-def_list ""}
+} {
+ Insert a word into the system. Insert definitions if provided. Create tests. If locale is Chinese, pinyin with numbers is changed to unicode.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return The object id of the new word.
+
+ @param def_list A comma-separated list of definitions that apply to the word.
+ @param def_locale The locale of all of the definitions in def_list. If def_locale is null, def_list is ignored.
+} {
+
+ if { [string equal [string tolower $locale] "ch_zh"] && [exists_and_not_null local_phonetic] } {
+ set local_phonetic [vocab::locale::pinyin_num_to_unicode -string $local_phonetic]
+ }
+ set id [db_string word_insert "
+ select vocab_word__new(:package_id, :word, :locale, :ipa_phonetic, :local_phonetic, :user_id,null)
+ "]
+
+ if { [exists_and_not_null def_list] } {
+ if { ![exists_and_not_null def_locale]} {
+ # defs but no def_locale? Give up.
+ return $id
+ }
+
+ # TODO: either here or in def::new, should check for
+ # existing words and try to match
+ # and try to link to existing words instead of creating def text
+
+ foreach def [split $def_list ,] {
+ vocab::word::def::new \
+ -word_id $id \
+ -locale $def_locale \
+ -definition [string trim $def]
+ }
+
+ vocab::train::test::new \
+ -package_id $package_id \
+ -test_type "ortho_from_ortho" \
+ -test_subject $id \
+ -locale_a $locale \
+ -locale_b $def_locale
+ }
+ return $id
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::edit {
+ -id:required
+ -word:required
+ -locale:required
+ -ipa_phonetic
+ -local_phonetic
+} {
+ Edit a word into the system.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return The object id of the new word.
+
+} {
+ db_dml word_edit {
+ update vocab_word
+ set word = :word,
+ locale = :locale,
+ ipa_phonetic = :ipa_phonetic,
+ local_phonetic = :local_phonetic
+ where id = :id
+ }
+ return $id
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::get {
+ -id:required
+ -array:required
+ {-locale_b ""}
+} {
+ Return word, ipa_phonetic, local_phonetic, and a list of definitions in the specified locale.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return id for success, -1 for failure.
+
+ @param array The name of an array to return
+} {
+ upvar 1 $array row
+ set got_word [db_0or1row question_select "
+ select vw.word,
+ vw.locale,
+ vw.ipa_phonetic,
+ vw.local_phonetic
+ from vocab_word vw
+ where vw.id = :id
+ " -column_array row]
+
+ if { !$got_word} {
+ return -1
+ }
+
+ if { [exists_and_not_null locale_b] } {
+ set def_list [db_list select_def_list "
+ select definition
+ from vocab_definition
+ where word_id = :id
+ and locale = :locale_b
+ "]
+ }
+
+ if { [exists_and_not_null def_list] } {
+ array set row [list definitions $def_list]
+ } else {
+ array set row [list definitions ""]
+ }
+ return $id
+}
+
+ad_proc -public vocab::word::delete {
+ -id:required
+} {
+ This proc deletes a word.
+ @return 0 for success
+} {
+ # TODO: improve security
+ auth::require_login
+ db_transaction {
+ db_dml word_defs_delete "
+ delete
+ from vocab_definition
+ where word_id = :id"
+ db_dml word_phonetic_example_delete "
+ delete
+ from vocab_phonetic_example
+ where word_id = :id"
+ db_dml word_word_list_delete "
+ delete
+ from vocab_word_list
+ where word_id = :id"
+
+ db_exec_plsql word_delete "
+ select vocab_word__delete(:id)
+ "
+ }
+ return 0
+}
+
+
+#####################################################################
+# vocab::word::def
+######################################################################
+
+namespace eval vocab::word::def {}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::def::new {
+ -word_id:required
+ -locale:required
+ -definition:required
+} {
+ Add a definition to a word.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-10
+ @return 0 for success
+
+} {
+ db_dml definition_insert {
+ insert into vocab_definition
+ (word_id, locale, definition)
+ values (:word_id, :locale, :definition)
+ }
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::def::get {
+ -id:required
+ -array:required
+} {
+ Get a definition.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-10
+ @return 0 for success
+
+ @param array The name of an array to return
+} {
+ upvar 1 $array row
+ db_1row definition_select {
+ select vw.word,
+ vd.word_id,
+ vd.sort_order,
+ vd.locale,
+ vd.definition
+ from vocab_definition vd,
+ vocab_word vw
+ where vd.id = :id
+ and vw.id = vd.word_id
+ } -column_array row
+
+ return 0
+}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::def::get_by_word {
+ -word:required
+ -locale:required
+} {
+ Get a definition.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-10
+ @return A list of definitions for the given word in the given locale.
+
+} {
+ return [db_list get_defs "
+ select vd.definition
+ from vocab_definition vd,
+ vocab_word vw
+ where vw.word = :word
+ and vw.id = vd.word_id
+ and vd.locale = :locale"]
+}
+
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::word::def::delete {
+ -id:required
+} {
+ This proc deletes a definition.
+ @return 0 for success
+} {
+ auth::require_login
+ db_dml def_delete "
+ delete
+ from vocab_definition
+ where id = :id"
+ }
+ return 0
+}
+
+
Index: openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl 23 Feb 2004 23:00:08 -0000 1.1
@@ -0,0 +1,245 @@
+ad_library {
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-08
+ @cvs-id $Id: vocabulary-train-procs.tcl,v 1.1 2004/02/23 23:00:08 joela Exp $
+
+}
+
+#---------------------------------------------------------------------
+# vocab::train
+#---------------------------------------------------------------------
+namespace eval vocab::train {}
+
+#---------------------------------------------------------------------
+ad_proc -public vocab::train::test_type_list {
+} {
+ Get a list of all test types.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-18
+ @return list of pairs of label and test_type
+} {
+ lappend list [list sentence sentence]
+ lappend list [list sentence_group sentence_group]
+ lappend list [list sentence_from_hint sentence_from_hint]
+ lappend list [list ortho_from_ortho ortho_from_ortho]
+ return $list
+}
+
+#---------------------------------------------------------------------
+# vocab::train::test
+#---------------------------------------------------------------------
+namespace eval vocab::train::test {}
+
+ad_proc -public vocab::train::test::new {
+ -package_id:required
+ -test_type:required
+ {-test_subject ""}
+ {-question ""}
+ {-answer ""}
+ {-locale_a ""}
+ {-locale_b ""}
+} {
+ Create a new test. Ste the question and answer values. TODO: if test_subject is a list, create multiple records in vocab_test_subject.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-16
+ @return ID of new test, or 0 if there was a problem.
+
+} {
+ # make sure we have all of the data necessary, and get it if we can
+ switch $test_type {
+ sentence {
+ # this isn't implemented yet
+ return 0
+ vocab::sentence::get -id $test_subject -array sentence_array
+ set row(question) "not implemented yet" ;#TODO: get the locale_b translation of a sentence as question,
+ set row(answer) $sentence_array(text)
+ }
+ sentence_from_hint {
+ if { ![exists_and_not_null question] } {
+ return 0
+ }
+ vocab::sentence::get -id $test_subject -array sentence_array
+ if { ![exists_and_not_null answer] } {
+ set answer $sentence_array(text)
+ }
+ }
+ ortho_from_ortho {
+ if { ![exists_and_not_null answer] || ![exists_and_not_null question] } {
+ vocab::word::get \
+ -id $test_subject \
+ -locale_b $locale_b \
+ -array word
+ if { ![exists_and_not_null question] } {
+ if { [exists_and_not_null word(local_phonetic)] } {
+ set phonetic "/$word(local_phonetic)/"
+ } elseif { [exists_and_not_null word(ipa_phonetic)] } {
+ set phonetic "/$word(ipa_phonetic)/"
+ } else {
+ set phonetic ""
+ }
+ set label [ad_locale_get_label $locale_b]
+ set question "What does $word(word) $phonetic mean in $label?"
+ }
+ if { ![exists_and_not_null answer] } {
+ set answer [list $word(definitions)]
+ }
+ }
+ }
+ default {
+ return 0
+ }
+ }
+ set test_id [db_string get_next_testid "
+ select nextval('vocab_test_id_seq')
+ "]
+
+ db_dml insert_test "insert into vocab_test
+ (id, package_id, test_type, test_subject, question, answer, locale_a, locale_b)
+ values (:test_id, :package_id, :test_type, :test_subject, :question, :answer, :locale_a, :locale_b)"
+ return $test_id
+}
+
+
+ad_proc -public vocab::train::test::get {
+ -test_id:required
+ -array:required
+ -target_locale:required
+} {
+ Return the question and answer for a test, depending on test type.
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return The test id.
+
+ @param test_id The test's unique ID
+ @param array The name of an array to return question, answer.
+ @param target_locale The locale_b of the answer.
+} {
+ upvar 1 $array row
+
+ db_1row get_test_info "
+ select test_type,
+ test_subject,
+ question,
+ answer,
+ locale_a
+ from vocab_test
+ where id = :test_id
+ and locale_b = :target_locale
+ " -column_array row
+ return $test_id
+}
+
+ad_proc -public vocab::train::test::delete {
+ -test_id:required
+} {
+ Return the question and answer for a test, depending on test type.
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return 0 for success; 1 for failure.
+
+ @param test_id The test's unique ID
+} {
+
+ # TODO: not checking permission here yet; instead just assuming that
+ # this can only get called by an admin
+ db_transaction {
+ db_dml delete_test_results "
+ delete
+ from vocab_test_result
+ where test_id = :test_id"
+
+ db_dml delete_test "
+ delete
+ from vocab_test
+ where id = :test_id"
+ }
+}
+
+#---------------------------------------------------------------------
+# vocab::train::result
+#---------------------------------------------------------------------
+namespace eval vocab::train::result {}
+
+ad_proc -public vocab::train::result::submit {
+ -test_id:required
+ -user_id:required
+ {-date ""}
+ -answer1:required
+ -array:required
+ -target_locale
+} {
+ Accept a user's answer to a test question, grade it, store and return the results.
+
+ @author Joel Aufrecht
+ @creation-date 2004-02-07
+ @return id of new test result
+
+ @param test_id The intended test id
+ @param answer1 The user's answer to the question.
+ @param date The date of the answer. Defaults to now.
+ @param array The name of an array to return quesion, user's answer, correct answer, and score.
+} {
+ if {![exists_and_not_null date]} {
+ set date [clock_to_ansi [clock seconds]]
+ }
+ upvar 1 $array row
+
+ vocab::train::test::get \
+ -test_id $test_id \
+ -array answer_key \
+ -target_locale $target_locale
+
+ # make sure we have everything we need
+ if { [exists_and_not_null answer_key(answer)] &&
+ ![string equal $answer_key(answer) ""] &&
+ [exists_and_not_null answer_key(test_type)] } {
+
+ switch $answer_key(test_type) {
+ sentence_from_hint {
+ set correct_answer $answer_key(answer)
+ if { [string equal $correct_answer $answer1] } {
+ set score 1
+ } else {
+ set score 0
+ }
+ }
+ ortho_from_ortho {
+ # see if the answer is in the list
+ set answer [join $answer_key(answer)]
+ # lsearch returns -1 for no match, 0 for match on 1st item
+ if { [lsearch $answer $answer1] > -1 } {
+ set score 1
+ } else {
+ set score 0
+ }
+ if { [llength $answer_key(answer)] > 0 } {
+ set correct_answer "[join $answer ", "]"
+ } else {
+ set correct_answer $answer_key(answer)
+ }
+ }
+ default {
+ format "question missing"
+ }
+ }
+ db_dml set_answer "
+ insert into vocab_test_result
+ (test_id, user_id, date, answer1, result1)
+ values (:test_id, :user_id, :date, :answer1, :score)
+ "
+ array set row [list question $answer_key(question)]
+ array set row [list user_answer $answer1]
+ array set row [list correct_answer $correct_answer]
+ array set row [list score $score]
+ array set row [list date $date]
+ array set row [list test_subject $answer_key(test_subject)]
+ } else {
+ array set row [list question $answer_key(question)]
+ array set row [list user_answer $answer1]
+ array set row [list correct_answer "No correct answer defined."]
+ }
+ return 0
+}
Index: openacs-4/contrib/packages/vocabulary/tcl/test/vocabulary-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/test/vocabulary-procs.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/tcl/test/vocabulary-procs.tcl 23 Feb 2004 23:00:08 -0000 1.1
@@ -0,0 +1,218 @@
+ad_library {
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-01
+ @cvs-id $Id: vocabulary-procs.tcl,v 1.1 2004/02/23 23:00:08 joela Exp $
+}
+
+aa_register_case -cats { smoke api } \
+ -procs {
+ vocab::word::new
+ vocab::word::get
+ vocab::word::edit
+ vocab::word::delete
+ } \
+ vocabulary__word_basic_tests {
+ Put some sample data in and then retrieve it.
+ } {
+ aa_run_with_teardown \
+ -rollback \
+ -test_code {
+ # use auto-test package id to avoid polluting any real instances
+ set package_id [ad_conn package_id]
+ aa_log "package_id is $package_id"
+ set user_id [auth::require_login]
+
+ #-----------------------------------------------------------------
+ # Generate test data
+ #-----------------------------------------------------------------
+
+ set word "test-wordæ[ad_generate_random_string]"
+ set locale en_US
+ set ipa_phonetic "test-ipa-phoneticø[ad_generate_random_string]"
+ set local_phonetic "test-local-phoneticæ[ad_generate_random_string]"
+ set def_locale da_DK
+ set def_list [list "test-def1[ad_generate_random_string]" "test-def2[ad_generate_random_string]"]
+
+ #-----------------------------------------------------------------
+ # New Record
+ #-----------------------------------------------------------------
+
+ set new_id [vocab::word::new \
+ -package_id $package_id \
+ -word $word \
+ -locale $locale \
+ -ipa_phonetic $ipa_phonetic \
+ -local_phonetic $local_phonetic \
+ -user_id $user_id \
+ -def_locale $def_locale \
+ -def_list $def_list
+ ]
+ aa_true "Creation succeeds" [exists_and_not_null new_id]
+ aa_log "new_id is $new_id"
+
+ #-----------------------------------------------------------------
+ # Retrieve Record
+ #-----------------------------------------------------------------
+
+ vocab::word::get \
+ -id $new_id \
+ -array test_array -locale_b $def_locale
+
+ aa_equals "Word match is successful" $test_array(word) $word
+ aa_equals "ipa_phonetic match is successful" $test_array(ipa_phonetic) $ipa_phonetic
+ aa_equals "local_phonetic match is successful" $test_array(local_phonetic) $local_phonetic
+ aa_equals "definition is successful" [join $test_array(definitions)] $def_list
+
+ #-----------------------------------------------------------------
+ # Edit Record
+ #-----------------------------------------------------------------
+
+ set word_edit "test-wordæ[ad_generate_random_string]"
+ set locale_edit en_US
+ set ipa_phonetic_edit "test-ipa-phoneticø[ad_generate_random_string]"
+ set local_phonetic_edit "test-local-phoneticæ[ad_generate_random_string]"
+
+ set edit_id [vocab::word::edit \
+ -id $new_id \
+ -word $word_edit \
+ -locale $locale_edit \
+ -ipa_phonetic $ipa_phonetic_edit \
+ -local_phonetic $local_phonetic_edit]
+
+ aa_equals "Edit succeeds" $edit_id $new_id
+ # to be pedantic, should also check that neither is null or 0, within the same test
+
+ #-----------------------------------------------------------------
+ # Retrieve Edited
+ #-----------------------------------------------------------------
+
+ vocab::word::get \
+ -id $new_id \
+ -array test_edit_array
+
+ aa_equals "Word match is successful" $test_edit_array(word) $word_edit
+ aa_equals "ipa_phonetic_edit match is successful" $test_edit_array(ipa_phonetic) $ipa_phonetic_edit
+ aa_equals "local_phonetic_edit match is successful" $test_edit_array(local_phonetic) $local_phonetic_edit
+
+ #-----------------------------------------------------------------
+ # Delete
+ #-----------------------------------------------------------------
+
+ set delete_id [vocab::word::delete \
+ -id $new_id]
+
+ aa_equals "Delete succeeds" $delete_id 0
+
+ set after_delete_id [vocab::word::get \
+ -id $new_id \
+ -array after_delete_array]
+
+ aa_equals "Cannot retrieve deleted row" $after_delete_id -1
+ aa_false "Retrieved array should be empty" [array exists after_delete_array]
+ }
+}
+
+aa_register_case -cats { smoke api } \
+ -procs {
+ vocab::sentence::new
+ vocab::sentence::get
+ vocab::sentence::edit
+ vocab::sentence::delete
+ } \
+ vocabulary__sentence_basic_tests {
+ Put some sample data in and then retrieve it.
+ } {
+ aa_run_with_teardown \
+ -rollback \
+ -test_code {
+ # use auto-test package id to avoid polluting any real instances
+ set package_id [ad_conn package_id]
+ aa_log "package_id is $package_id"
+ set user_id [auth::require_login]
+
+ #-----------------------------------------------------------------
+ # Generate test data
+ #-----------------------------------------------------------------
+
+ set text "test sentence [string tolower [ad_generate_random_string]]"
+ set locale en_US
+ set word_list test_word_list
+
+ #-----------------------------------------------------------------
+ # New Record
+ #-----------------------------------------------------------------
+
+ set new_id [vocab::sentence::new \
+ -package_id $package_id \
+ -user_id $user_id \
+ -text $text \
+ -locale $locale \
+ -word_list $word_list]
+
+ aa_true "Creation succeeds" [exists_and_not_null new_id]
+ aa_log "new_id is $new_id"
+
+ #-----------------------------------------------------------------
+ # Retrieve Record
+ #-----------------------------------------------------------------
+
+ vocab::sentence::get \
+ -id $new_id \
+ -array test_array
+
+ aa_equals "Sentence match is successful" $test_array(text) $text
+ aa_equals "locale match is successful" $test_array(locale) $locale
+ aa_equals "word list is correct" $test_word_list [split $text]
+
+ #-----------------------------------------------------------------
+ # Edit Record
+ #-----------------------------------------------------------------
+
+ set text_edit "test sentenceæ [ad_generate_random_string]"
+ set locale_edit en_US
+
+ set edit_id [vocab::sentence::edit \
+ -id $new_id \
+ -text $text_edit \
+ -locale $locale_edit]
+
+ aa_equals "Edit succeeds" $edit_id $new_id
+
+ #-----------------------------------------------------------------
+ # Retrieve Edited
+ #-----------------------------------------------------------------
+
+ vocab::sentence::get \
+ -id $new_id \
+ -array test_edit_array
+
+ aa_equals "Sentence match is successful" $test_edit_array(text) $text_edit
+ aa_equals "Locale match is successful" $test_edit_array(locale) $locale_edit
+ #-----------------------------------------------------------------
+ # Delete
+ #-----------------------------------------------------------------
+
+ set delete_id [vocab::sentence::delete \
+ -id $new_id]
+
+ aa_equals "Delete succeeds" $delete_id 0
+
+ set after_delete_id [vocab::sentence::get \
+ -id $new_id \
+ -array after_delete_array]
+
+ aa_equals "Cannot retrieve deleted row" $after_delete_id -1
+ aa_false "Retrieved array should be empty" [array exists after_delete_array]
+ }
+}
+
+aa_register_case vocabulary__put_and_get_sentence {
+ Put some sample data in and then retrieve it.
+} {
+ aa_log "If you are only seeing this test case, it's because you don't have acs-automatic-testing 5.1 or greater and so you can't see the other cases."
+}
+
+
+
+
+
Index: openacs-4/contrib/packages/vocabulary/www/definition-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/definition-delete.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/definition-delete.tcl 23 Feb 2004 23:00:08 -0000 1.1
@@ -0,0 +1,19 @@
+ad_page_contract {
+ Delete a definition
+
+ @author Joel Aufrecht
+ @cvs-id $Id: definition-delete.tcl,v 1.1 2004/02/23 23:00:08 joela Exp $
+
+ @param id The id of the word to delete
+} {
+ id:integer
+ {return_url "word-list"}
+}
+
+auth::require_login
+
+vocab::word::def::delete \
+ -id $id
+
+ad_returnredirect $return_url
+ad_script_abort
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/www/definition-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/definition-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/definition-edit.adp 23 Feb 2004 23:00:09 -0000 1.1
@@ -0,0 +1,8 @@
+| Vocabulary stores words, sentences,
+ and phonetic spellings in any language. Definitions in any language
+ can be added to any word. Add words, sentences, or sentence lists
+ to your personal testing list. Test yourself in flashcard or
+ sentence mode.
+ Planned features include: import and export of word lists (leading + to full network syncing between vocabulary sites; audio + clips and audio testing; printable tests; a framework for asking + other people to score your tests and to do the same in exchange. Full TODO list. My goal is to produce a site that + supports an active community of language learners helping each + other, and is a public domain vocabulary resource. + To use the vocabulary, browse the word list and + add words to your personal list. Sentences can be added in groups. You + can change the language you are being tested + in. Good sources of words can be found in the Resources Section. Currently you must + mangle word lists into CSV but a dict import filter is pending. + |
+
+ |
+
+
|
+ |
+
+ |
+
|
+
+ |
+
+ |
+
+ |
+
Export all the words currently on this page as a CSV
Index: openacs-4/contrib/packages/vocabulary/www/word-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-list.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/word-list.tcl 23 Feb 2004 23:00:11 -0000 1.1
@@ -0,0 +1,18 @@
+ad_page_contract {
+
+ Word list.
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-01
+ @cvs-id $Id: word-list.tcl,v 1.1 2004/02/23 23:00:11 joela Exp $
+
+} {
+ locale:optional
+ orderby:optional
+}
+set title "Words"
+set context [list $title]
+vocab::conn
+set subnavbar_link [vocab::subnav_prep -package_id $package_id]
+set return_url "[ad_conn url]?[ad_conn query]"
+set word_list_csv_url [export_vars -base "word-list-csv" {locale orderby}]
Index: openacs-4/contrib/packages/vocabulary/www/word-train-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-train-add.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/word-train-add.tcl 23 Feb 2004 23:00:11 -0000 1.1
@@ -0,0 +1,36 @@
+ad_page_contract {
+ Add a word and its tests for a user.
+
+ @author Joel Aufrecht
+ @cvs-id $Id: word-train-add.tcl,v 1.1 2004/02/23 23:00:11 joela Exp $
+
+ @param id The id of the word to add.
+} {
+ id:integer
+ return_url
+}
+
+set user_id [auth::require_login]
+vocab::conn
+
+# Put the word on the user's list
+db_dml add_word_to_list "
+ insert into vocab_word_list
+ (user_id, word_id, date_added, package_id, locale)
+ values (:user_id, :id, current_timestamp, :package_id, :locale_b)
+"
+
+# Assign all locale-appropriate tests for this word to the user
+db_dml add_word_tests "
+ insert
+ into vocab_user_test_map (user_id, test_id, date_added)
+ select :user_id,
+ id,
+ current_timestamp
+ from vocab_test
+ where test_subject = :id
+ and locale_b = :locale_b
+"
+
+ad_returnredirect $return_url
+ad_script_abort
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/www/word-train-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-train-delete.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/word-train-delete.tcl 23 Feb 2004 23:00:11 -0000 1.1
@@ -0,0 +1,27 @@
+ad_page_contract {
+ Delete a word.
+
+ @author Joel Aufrecht
+ @cvs-id $Id: word-train-delete.tcl,v 1.1 2004/02/23 23:00:11 joela Exp $
+
+ @param item_id The item_id of the word to delete
+} {
+ id:integer
+ return_url
+}
+
+set user_id [auth::require_login]
+set package_id [ad_conn package_id]
+db_dml delete_word_from_list "
+ delete
+ from vocab_word_list
+ where user_id = :user_id
+ and package_id = :package_id
+ and word_id = :id
+"
+
+# TODO: suppress any active tests (but don't delete, or we will
+# have to delete any test results too
+
+ad_returnredirect $return_url
+ad_script_abort
\ No newline at end of file
Index: openacs-4/contrib/packages/vocabulary/www/word-train-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-train-list.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/word-train-list.adp 23 Feb 2004 23:00:11 -0000 1.1
@@ -0,0 +1,7 @@
+ Design Notes
+
+Release Notes
+
+
+encoding system utf-8 into
+ serverroot/tcl/zz-postload.tcl but I don't know if
+ it made any difference.
+Feature list
+Implemented features are overstruck. Current priorities are in bold face.
+
+
+
+
+
+
+
+
+
+word tests don't respect testing locale
+random testing doesn't do anything interesting if you haven't
+ added anything to your lists; instead it should just
+ grab something, anything.
+your scores should instead be a list of all tests you either have
+ results in or have put on your list; ie, merge tests and
+ your tests.
+can't delete definitions; get error on edit
+Deleting words fails if definitions are present - should cascade
+
+
+store words
+store definitions - support both links and new
+ text as definitions
+store phonetic spellings
+
+
+Basic sentence storage
+store sentences in groups (maybe category is enough?)
+store groups of sentences and put a useful label
+ on the group
+
+
+
+
+handle skipped questions
+Fix bad answers (my answer is correct, edit anwser) for
+ all for just you
+
+
+Use a t/f field in tests so that they can be taken off the list
+without losing test results - mooted
+
+
+Input the first Chinese words - first 3000 or 6000
+
+
+words, sentences, phonetic alphabets
+words, sentences, phonetic
+ alphabets
+
+
+Auto-generate examples by looking into phonetic
+ spelling okay, now do two examples
+
+
+
+
+Store and allow changing current working locale
+Add a wizard for directly adding word+def to word list
+
+
+Use subnavbar to show locale settings and subglobal
+ nav
+write a flow map for the whole thing
+Put "Add another word" link on word-edit
+prettier formatting for the white pseudo-button
+
+
+set and retain the working locales
+move everything into procs
+
+write a data dictionary/diagram
+Merge vocabulary and vocabulary-test
+redo subnav prep as vocab::conn
+implement the flow map in the new subnavbar
+Think hard about data model for tests and sentences: put
+ sentence hint in test, not sentence?
+ YES. should tests have user_ids? NO.
+Use subnavbar to show locale settings and subglobal
+nav
+
+
+Refactoring list
+
+
Index: openacs-4/contrib/packages/vocabulary/www/doc/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/doc/index.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/vocabulary/www/doc/index.tcl 23 Feb 2004 23:00:11 -0000 1.1
@@ -0,0 +1,15 @@
+ad_page_contract {
+
+ Front page for vocabulary docs
+
+ @author Joel Aufrecht (joel@aufrecht.org)
+ @creation-date 2004-02-01
+ @cvs-id $Id: index.tcl,v 1.1 2004/02/23 23:00:11 joela Exp $
+
+} {
+}
+
+set page_title "Documentation"
+set context [list $page_title]
+vocab::conn
+set subnavbar_link [vocab::subnav_prep -package_id $package_id]
Index: openacs-4/contrib/packages/vocabulary/www/doc/vocab-data-model.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/doc/vocab-data-model.dia,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/vocabulary/www/doc/vocab-data-model.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/doc/vocab-data-model.png,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/vocabulary/www/doc/vocab-flow-map.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/doc/vocab-flow-map.dia,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/vocabulary/www/doc/vocab-flow-map.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/doc/vocab-flow-map.png,v
diff -u
Binary files differ
Make vocabulary-trainer use the same subnav structure as vocab
+
+
+
+capture a definition during word creation
+Revise front page into link/portlet thingie
+
+
+provide word data via API call
+Don't show button in view mode of word-edit
+